Commit graph

4121 commits

Author SHA1 Message Date
modmuss50
cb292205dd Dont force a crash, just let it happen naturally, 2018-12-08 23:37:31 +00:00
modmuss50
a04760bac1 Tweak incompatible message 2018-12-08 22:34:15 +00:00
modmuss50
7433eb7630 Fix bad rename 2018-12-08 22:05:36 +00:00
modmuss50
bb5a3e2647 Clean up ic2 support 2018-12-08 20:48:21 +00:00
modmuss50
7db621fbed Abstract ic2 in RebornCore, rewrite Reborn Core's configs 2018-12-08 20:15:20 +00:00
modmuss50
1dd864f467 #releaseBuild Large refactor, ensure you update TechReborn and RebornCore 2018-12-08 16:43:07 +00:00
drcrazy
5d4ffab5de Adjusted JEI clickareas 2018-12-05 17:50:54 +03:00
drcrazy
7c1daf83e0 Updated JEI button location. 2018-12-04 18:12:05 +03:00
modmuss50
f91493dbc5 Move gui code to reborn core 2018-12-02 16:13:00 +00:00
modmuss50
b399e211fa Move container builder to Reborn Core 2018-12-02 01:15:03 +00:00
modmuss50
e7604cd9ce #betaBuild 2018-11-30 17:26:10 +00:00
modmuss50
8334de2604 Fix config going into wrong dir 2018-11-27 18:01:50 +00:00
modmuss50
385a5ea8b5 Include TechReborn Mod Compatibility using jar in jar 2018-11-16 16:51:26 +00:00
modmuss50
dc64b26655 Fix build? 2018-11-16 15:47:06 +00:00
modmuss50
aa0ffe7559 Stage one of moving compat code out into a separate project 2018-11-16 15:44:33 +00:00
modmuss50
891e2ea13b Add ae2 api to try and fix and odd crash with mekanism 2018-11-16 13:25:41 +00:00
modmuss50
609b86c46f #releaseBuild 2018-11-15 12:35:34 +00:00
modmuss50
a27007e1a3 Clean up of compat code 2018-11-15 12:29:42 +00:00
modmuss50
f808c61a51 Use mekanism's gas registry to register mek gases to be used in the gas turbine. Closes #1575
Remove some old psi compat code as well as it was never used
2018-11-15 12:24:42 +00:00
modmuss50
7e5ec8d70f Fix retro gen. Fixes #1622 2018-11-15 11:06:53 +00:00
drcrazy
7ce4a022af Cables got tooltip update. Closes #1627 2018-11-07 03:03:26 +03:00
drcrazy
9f3a3eb026 Refactoring of tooltips 2018-11-06 18:12:19 +03:00
drcrazy
941629e790 Progress for matter fabricator finally works. Closes #1630 2018-11-06 17:46:07 +03:00
drcrazy
c7db26c21e Legacy code removed 2018-11-06 12:56:16 +03:00
drcrazy
430f534b3a Updated JEI compat to use VanillaTypes once again. 2018-11-05 13:03:00 +03:00
drcrazy
7ab571bcc7 More marble dust required to make calcite dust. Closes #1629 2018-11-05 12:39:22 +03:00
Modmuss50
05fff8f9b6
#releaseBuild 2018-11-01 09:11:02 +00:00
drcrazy
df13aeeba2 Should fix electric furnace progress + formatting. Closes #1621 2018-10-29 17:40:16 +03:00
drcrazy
50e35578a2 Matter fabricator got progress arrow back. Closes #1617 2018-10-23 17:54:12 +03:00
drcrazy
26e09d1687 WaterMill and neutron reflectors deduplicated. Closes #1620 2018-10-23 17:26:39 +03:00
drcrazy
066c6ba3e0 INitial work on #1620 2018-10-23 13:44:06 +03:00
drcrazy
bdd961e0a7 Rubber wood block will give more slabs and stairs. Closes #1619 2018-10-19 16:10:23 +03:00
Modmuss50
eee87e3ecd
Fix running in dev?
I havent tested this, lets hope github web edit can save the day
2018-10-18 17:29:51 +01:00
Prospector
0cbefc63d2 Rename 1 thing 2018-10-17 18:21:57 -07:00
drcrazy
4c956e39f6 Fix dependencies 2018-10-08 18:37:26 +03:00
drcrazy
2eb53c3589 Updated forge to 14.23.5.2768 2018-10-08 16:59:21 +03:00
modmuss50
3c7c5cbaa1 Fix build #releaseBuild 2018-10-07 22:54:50 +01:00
modmuss50
f45bdcee9b Fix build 2018-10-07 22:49:02 +01:00
modmuss50
fa31f62426 #releaseBuild 2018-10-07 22:05:08 +01:00
modmuss50
7fe876fe73 Fix #1614 2018-10-07 21:53:46 +01:00
modmuss50
20b1874e2c Fix #1602 2018-10-07 21:36:39 +01:00
modmuss50
a0ee459d13 Make empty cells require a glass pane due to thermal expansion changing their gear recipes to clash. Config to disable + add old recipe to rolling machine 2018-10-07 21:31:35 +01:00
modmuss50
66e60655bf Work towards https://github.com/TechReborn/TechReborn/issues/1614 still need to move all the other recipes that need it to use the ore dict 2018-10-07 21:20:18 +01:00
drcrazy
4612ab334c Cleanup of model registration 2018-10-04 12:38:34 +03:00
drcrazy
ec0724b15f Refactoring for model registration 2018-10-03 18:26:47 +03:00
drcrazy
4ea5d2a818 Fix model registration. Moved items reg to event. 2018-10-03 17:34:03 +03:00
drcrazy
e9c2857db8 Initial work on event based registration 2018-09-26 18:28:59 +03:00
modmuss50
6713cd6296 Initial removal of itemblocks, wrench now drops the item with the nbt of the tile.
This is still WIP but mostly seems to work
2018-09-25 17:51:25 +01:00
drcrazy
d06bd5eef9 Improvements for debug tool and solar panel 2018-09-25 16:00:44 +03:00
drcrazy
1e9cfa07b6 Removed excessive setCreativeTab from blocks 2018-09-25 13:56:59 +03:00