Commit graph

425 commits

Author SHA1 Message Date
drcrazy
440c089b5f Fixed scrapbox list of outputs. Closes #1317. I hope ) 2017-10-24 15:09:53 +03:00
modmuss50
3901d60545 Some work on charging ic2 items, moving back to a proper pc. 2017-10-22 18:23:58 +01:00
modmuss50
1c6336eb68 Add grinder support to CT, closes https://github.com/TechReborn/TechReborn/issues/1318 2017-10-22 18:12:31 +01:00
drcrazy
a57c09f633 Added ability to remove single\all scrapbox outputs. Closes #1305 2017-10-20 23:09:05 +03:00
drcrazy
7d7340111d Added Distillation tower. Closes #884 2017-10-16 15:52:10 +03:00
drcrazy
2fd8df2118 Added CT support for plasma generator 2017-10-13 17:41:29 +03:00
drcrazy
ae1dfe4e45 Fixed warning related to deprecated JEI compat. 2017-10-13 13:31:11 +03:00
modmuss50
62251e7842 Merge remote-tracking branch 'origin/1.12' into 1.12 2017-10-13 11:07:26 +01:00
modmuss50
a26d11ee51 Fix small issue with TOP support. 2017-10-13 11:07:18 +01:00
drcrazy
47134cf2ab Added plasma generator. Some work on #884 2017-10-13 03:20:34 +03:00
modmuss50
09969559e8 Add fluid gen support to CT, closes #1153 2017-10-12 22:10:41 +01:00
modmuss50
e490669405 Fixes CraftTweaker support, closes #1303 2017-10-12 21:19:51 +01:00
modmuss50
984e9eb2f2 Improve TOP support 2017-10-12 17:50:03 +01:00
modmuss50
23ccd878bd Fix rolling machine CT 2017-10-11 17:42:27 +01:00
modmuss50
c80cc0101f Allow changing of the power cost view in fusion reactor recipes. 2017-10-11 12:56:29 +01:00
drcrazy
369a19b239 Updated alloy smelter GUI to use guiBase 2017-10-03 14:44:08 +03:00
drcrazy
40e470629d Added check for config for block break with pickaxe. Closes #1172 2017-09-28 02:03:16 +03:00
modmuss50
ffe13d0c79 Update rolling machine CT support for 1.12 closes #1251 2017-09-27 13:45:49 +01:00
drcrazy
8de19ff5e7 Fix warnings 2017-09-14 17:55:28 +03:00
drcrazy
f39026b959 JEI integration refactoring 2017-09-13 13:27:33 +03:00
drcrazy
5d441defa7 Update IndustrialElectrolyzer GUI to GuiBase. Closes #1272.
Also started JEI refactoring
2017-09-13 03:40:38 +03:00
drcrazy
b13d282bf1 Fix unused imports 2017-09-09 01:54:43 +03:00
alexpic57
1d873c2d33 fix identation + remove unused import + fix jei button on ImplosionCompressor 2017-09-08 13:58:27 +02:00
alexpic57
e4b5d3378a update Implosion Compressor to GuiBase 2017-09-08 09:48:55 +02:00
drcrazy
ab1802ba5e Refactoring for translation 2017-09-08 02:03:35 +03:00
drcrazy
849f9fc07b Fix null IItemstack being converted to air. I hope. Closes #1222 2017-09-05 18:02:42 +03:00
drcrazy
dfaef8a6c2 Updated fluid generators GUI. Closes #1097 2017-09-04 00:12:58 +03:00
drcrazy
37d8b8641f GUI rework for Diesel generator 2017-09-03 03:41:50 +03:00
drcrazy
ab1428eb12 Fix for machine tank drain. More luv to industrial grinder. (#1254)
* Fix for machine tank drain. More luv to grinder

Fix for empty cell drained from tank.
JEI should honor power units (FE\EU) used.
Fill\drain tank only two times per second in order to avoid game crash
due to ticking entity.
2017-08-29 19:57:21 +03:00
modmuss50
0906f1fdc1
Fixes #1201 2017-07-28 21:03:12 +01:00
modmuss50
ea7baf437b
Fix small exploit with TE integration. 2017-07-28 20:28:23 +01:00
modmuss50
de323b847a
Add Pyrotheum to fluid gen + clean up fluid handling, closes #1054 2017-07-07 00:02:14 +01:00
modmuss50
cead631367
Added a generous amount of recipes into thermal expansion, close #1110 2017-07-06 23:49:00 +01:00
modmuss50
774fec221e
Auto format code 2017-06-28 20:54:12 +01:00
modmuss50
c0aab7f37a
Update crafttweaker support 2017-06-28 20:50:00 +01:00
Nourepide
c8dfcb3ba5 Fix missing names in JEI (#1149)
* Fix missing names in GUI machines

* Fix missing names in JEI
2017-06-23 14:05:44 +01:00
modmuss50
a701094d1d
Update all license headers 2017-06-15 12:28:26 +01:00
modmuss50
426001251f
Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
2017-06-14 23:30:35 +01:00
modmuss50
f1c5a0ad8d
Large bunch of recipe work, still shapedOreRecipes need fixing. 2017-06-14 22:50:20 +01:00
Prospector
40e3062903 Continue the great refactor of mid 2017 (A lot of stuff still broken, it's a WIP) 2017-06-14 08:56:09 -07:00
modmuss50
708ccc758a
Mappings update 2017-06-13 22:07:49 +01:00
modmuss50
2292741443
Update walia support 2017-06-13 20:37:17 +01:00
modmuss50
2df2a1d1ba
Remove old config system 2017-06-12 20:51:36 +01:00
modmuss50
b7e141e004
More config changes 2017-06-12 20:33:30 +01:00
modmuss50
b25742dde0
Auto format code 2017-06-12 14:23:32 +01:00
modmuss50
624d8fb93a
Remove old cables 2017-06-12 10:55:26 +01:00
modmuss50
06d366b941
Update Gradle + JEI compact 2017-06-12 09:48:52 +01:00
modmuss50
29cf9fa90b
1.12 2017-06-11 21:22:07 +01:00
Prospector
81f701477c Fix compile 2017-06-09 08:47:44 -07:00
modmuss50
cba5fff3c2
Remove new cable from JEI blacklist 2017-06-09 15:11:59 +01:00