Commit graph

3743 commits

Author SHA1 Message Date
modmuss50
901e472844 #releaseBuild 2019-01-04 21:47:37 +00:00
modmuss50
95ef8e4df5 #releaseBuild 2019-01-03 14:05:49 +00:00
modmuss50
94fd111224 #releaseBuild 2019-01-03 14:00:33 +00:00
drcrazy
d67f670141 addHologramButton is now in RC 2018-12-30 22:50:03 +03:00
drcrazy
3df454789f Draw hologram button on background 2018-12-30 22:31:52 +03:00
drcrazy
03fdbe49a6 Power bar tooltip should be on top of hologram button 2018-12-30 02:48:35 +03:00
drcrazy
d41da2457f Lock button works again 2018-12-30 01:19:23 +03:00
drcrazy
b33b3d8745 Updates due to TR GUI builder gone. 2018-12-28 18:07:56 +03:00
coderbot16
fbec0c89c2 Finalize IC2 electric item support (#1644)
* Item charging no longer uses CapabilityEnergy, now fully uses ExternalPowerSystems

* Remove accidental update from build.gradle

* Remove some unused imports

* Use requestEnergyFromArmor in all powered tools
2018-12-28 09:25:40 +00:00
drcrazy
5724fc3d8c Rolling machine can now charge from battery. Closes #1645 2018-12-28 12:24:05 +03:00
coderbot16
a766cdfa53 Remove almost all explicit uses of CapabilityEnergy (#1643)
* Battery packs (ItemLithiumBackpack/ItemLapotronPack) still use CapEnergy explicitly, but don't charge IC2 items.
 * Note: Before we can remove FE, we have to modify StackInfoHUD and ItemUtils in RebornCore.
2018-12-27 13:58:55 +00:00
drcrazy
fbc8ceb1ed AESU poweroutput icon fixed 2018-12-22 13:06:03 +03:00
modmuss50
e299518c4e #releaseBuild 2018-12-20 11:18:35 +00:00
drcrazy
e2c8284bc5 Added config for Rubber Tree plantations in villages. Closes #1639 2018-12-19 18:22:45 +03:00
drcrazy
3b1b0b59da Removed more excessive this-es. 2018-12-17 18:09:40 +03:00
drcrazy
6e237a4fcb Removed excessive this-es. WIP 2018-12-17 15:53:35 +03:00
drcrazy
15cf0d49ad scrap slot same is usual slot. 2018-12-17 15:26:50 +03:00
drcrazy
83fd409e94 Fixed license and unused imports 2018-12-12 16:14:36 +03:00
modmuss50
08b8039e9f #releaseBuild 2018-12-09 14:06:58 +00:00
modmuss50
0d9e98b370 Cleanup ic2 support 2018-12-09 00:24:52 +00:00
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