Commit graph

279 commits

Author SHA1 Message Date
Modmuss50
1321422edf Fixes #273 2015-11-16 19:01:27 +00:00
Modmuss50
78a7bcf4bc Recoded MT support 2015-11-15 20:51:54 +00:00
Modmuss50
1551164cd6 Some work on recoding MT support 2015-11-13 13:18:48 +00:00
Modmuss50
bb2914bf5d Fix imports 2015-11-13 08:28:32 +00:00
Modmuss50
de1d036b33 Revert "Fixes #219 Potentialy breaking for MT scripts."
This reverts commit f326dbfec9.
2015-11-13 08:27:02 +00:00
Modmuss50
a7001bbfd7 Revert "fixes #219 again"
This reverts commit d562e1222a.
2015-11-13 08:26:51 +00:00
Modmuss50
7e07320844 Removed unused imports 2015-11-12 19:50:20 +00:00
Modmuss50
d562e1222a fixes #219 again 2015-11-12 08:22:47 +00:00
Modmuss50
08b570ea36 Fixes #244 2015-11-11 17:08:41 +00:00
Modmuss50
8f45d418e3 Fixes crafting for lapotronicOrb 2015-11-11 16:50:28 +00:00
Modmuss50
2dd4e93f41 Cleaned up ore recipes, closes #241 2015-11-11 16:46:50 +00:00
Modmuss50
3799eb3eb2 Work for #182 2015-11-11 08:33:05 +00:00
Modmuss50
f326dbfec9 Fixes #219 Potentialy breaking for MT scripts. 2015-11-11 08:21:21 +00:00
modmuss50
ef03cf50a9 Merge branch 'master' of https://github.com/TechReborn/TechReborn
Conflicts:
	src/main/java/techreborn/asm/LoadingPlugin.java
	src/main/java/techreborn/client/gui/GuiBlastFurnace.java
	src/main/java/techreborn/client/render/MultiblockRenderEvent.java
	src/main/java/techreborn/compat/recipes/RecipesIC2.java
	src/main/java/techreborn/init/ModItems.java
	src/main/java/techreborn/lib/Location.java
	src/main/java/techreborn/packets/PacketPipeline.java
	src/main/java/techreborn/partSystem/fmp/CableConverter.java
2015-11-08 12:34:18 +00:00
modmuss50
8abf6e5282 Moved to RebornCore 2015-11-08 12:15:45 +00:00
Modmuss50
678a44937f Should fix #211 2015-11-07 08:58:26 +00:00
Modmuss50
9d9a1dba60 Fixes #231 2015-11-03 19:42:49 +00:00
MrBretzel
1307406e10 Adding iron alloy smelter to not enough items and fix ChargedHud possible crash 2015-11-01 23:10:32 +01:00
modmuss50
bffbd31cab Sort of Revert "why was this done twice"
This reverts commit 363adeb681.

Fixes #209
2015-11-01 16:24:35 +00:00
MrBretzel
b8487f5eb5 Fix #196 and mini clean up 2015-10-25 07:34:37 +01:00
modmuss50
50fa2e8a1d Fixes #194 2015-10-22 18:19:05 +01:00
Modmuss50
7ae4ec1a98 Clean up of ic2 classic recipes 2015-10-14 13:39:05 +01:00
Modmuss50
652bea5bcd More tweaks based off #189 2015-10-14 13:31:20 +01:00
Modmuss50
cae4aad955 fixes #189 2015-10-14 13:27:43 +01:00
gigabit101
935a8bc382 Removed more junk 2015-10-09 22:11:04 +01:00
gigabit101
a8ea0f55e7 Removed a load of un needed junk from other versions of Gtech 2015-10-09 21:55:54 +01:00
Modmuss50
cb6551c7ca Fixed compile error with last commit 2015-10-07 11:17:09 +01:00
Modmuss50
6a404ba617 Fixes #166 2015-10-07 11:15:55 +01:00
Modmuss50
9c52e0ace7 Fixes #170 and fixes #167 2015-10-07 08:34:24 +01:00
Modmuss50
d490d00ab0 Removed forestry version checker, will try fix again later 2015-10-06 21:51:09 +01:00
Modmuss50
599ab5d634 Clean up forestry version checker 2015-10-06 20:47:50 +01:00
Modmuss50
4683f1450f Disables forestry intergtation when not using version 4 or higher 2015-10-06 20:46:03 +01:00
Modmuss50
04a21f4dc7 Fixes #163 2015-10-05 11:18:44 +01:00
modmuss50
a390a37cb1 Fixes forestry saw mill recipes 2015-10-03 12:39:18 +01:00
modmuss50
3708a49bb9 Initial update to forestry 4(Sawmill recipes are not working) 2015-10-03 10:21:13 +01:00
modmuss50
146deb0e8b Added recipes to IC2 classic, fixed recipes when using ic2, fixes #158 2015-10-02 21:01:30 +01:00
Modmuss50
a6792f37c6 Fixes #155 thanks @XuPuPG 2015-09-29 19:13:46 +01:00
Modmuss50
3f4b59faaf Fixes #130 2015-09-23 17:27:41 +01:00
modmuss50
ccaabdd230 Started work on adding the recipes back to ic2 classic 2015-09-20 13:55:54 +01:00
Modmuss50
bd1540b27b Fixed fluid power value importing 2015-09-14 21:34:56 +01:00
Modmuss50
0bf7e1968e Fixed ic2 classic support on the master! 2015-09-14 21:05:26 +01:00
modmuss50
61a51b52a7 Fixes #83 2015-09-11 13:34:20 +01:00
modmuss50
8aafd118f5 Added fluid power manager, imports from forestry and bc 2015-09-08 18:39:59 +01:00
modmuss50
72799a9474 Added some fuels to forestry's api, might write our own and import bc's and forest into ours. 2015-09-08 13:26:24 +01:00
modmuss50
e02b1518d2 updates to the aesu gui 2015-09-05 21:09:37 +01:00
modmuss50
ebc685ba3d Improvements to the compat manager. 2015-08-30 21:16:22 +01:00
modmuss50
15b9671dc4 fixes #120 2015-08-27 13:09:31 +01:00
modmuss50
d33c93005d Added all of the machines to minetweaker. (untested) 2015-08-27 10:22:17 +01:00
modmuss50
c8e7e923ed Added more minetweaker support 2015-08-27 09:04:41 +01:00
modmuss50
f9823b6ba6 Fixed minetweaker support for AlloyFurnace 2015-08-27 08:55:34 +01:00