Commit graph

2916 commits

Author SHA1 Message Date
drcrazy
8e34062f6e Iron alloy smelter should consume right amount of inputs. Closes #1667 2019-02-13 14:56:49 +03:00
drcrazy
fbcab3bf2d DRY for IronAlloySmelter fuel burn time 2019-02-13 11:21:21 +03:00
drcrazy
3fb799e544 Removed unused imports 2019-02-11 15:35:37 +03:00
drcrazy
0fa72c4fc3 More efficient diamond grinding and armor recycling 2019-02-11 15:32:24 +03:00
modmuss50
b9169c5397 Merge remote-tracking branch 'origin/1.12' into 1.12 2019-02-07 20:26:52 +00:00
modmuss50
c4fff1bf56 Should fix #1666 2019-02-07 20:26:41 +00:00
modmuss50
4797d64f5b #releaseBuild fix Advanced alloy 2019-02-05 00:15:43 +00:00
modmuss50
6595bb80c5 Move type registry to before the ic2 dict, add advanced alloy to classic dedupe. 2019-02-04 21:51:21 +00:00
modmuss50
8549129870 Dont register refined iron smelting recipe with classic dedupe enabled 2019-02-04 21:27:49 +00:00
modmuss50
f836fb84c7 Move IC2_PROFILE to a config, the event is fired too early to be used. 2019-02-04 20:53:33 +00:00
modmuss50
6916de2ad7 Added support for ic2 exp classic profile 2019-02-04 20:19:51 +00:00
modmuss50
9301cfbc90 Improve rolling machine item balancing, it will no longer move items around when there isnt a better distribution 2019-02-01 14:46:18 +00:00
modmuss50
72a09d2368 Fixes some possible NPE locations 2019-02-01 13:42:21 +00:00
coderbot
3e44fc369f Transformers now declare that they can output multiple packets per tick 2019-01-28 17:38:02 -08:00
modmuss50
12b892f0dc Fix Alarm recipe with IC2 Dedupe 2019-01-27 01:42:52 +00:00
modmuss50
8505616651 Fix fusion coil not being crafted with ic2 de-dupe 2019-01-26 19:06:51 +00:00
modmuss50
0228d72179 Always add refined iron ingot to smelting, I forgot to remove it 2019-01-24 21:38:21 +00:00
modmuss50
f4a24d7c25 Fixes to retro gen 2019-01-24 21:35:39 +00:00
modmuss50
5a9349ced4 Pull back power output on Thermal gen as I made it a bit too much last commit. Now 16 2019-01-24 21:26:56 +00:00
Modmuss50
bc1e2ca7eb
Thermal Generator now outputs 32 eu/tick 2019-01-20 21:14:15 +00:00
modmuss50
498d675f30 Remove Refined Iron from ic2 duplicates 2019-01-18 16:20:34 +00:00
drcrazy
292664b8e1 Fixed i18n usage on server. Closes #1655 2019-01-16 18:07:48 +03:00
drcrazy
7cc0c472f9 Adjustments for updated power output icon. 2019-01-14 15:11:26 +03:00
drcrazy
1a8c730591 Plasma generator got its icon in JEI. Closes #1653 2019-01-14 14:10:26 +03:00
drcrazy
8a03b0eca2 More on #1654 2019-01-14 14:04:58 +03:00
drcrazy
381fbfb463 Fix JEI info for sawmill energy usage. Some work for #1654 2019-01-14 14:04:22 +03:00
modmuss50
95ef8e4df5 #releaseBuild 2019-01-03 14:05:49 +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
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
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
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