Commit graph

1226 commits

Author SHA1 Message Date
Modmuss50
df5bd1422a Fixes #267 2015-11-15 20:54:31 +00:00
Modmuss50
78a7bcf4bc Recoded MT support 2015-11-15 20:51:54 +00:00
modmuss50
16f1a8de17 Charge bench recode. 2015-11-13 19:00:17 +00:00
gigabit101
421597fbab Added missing localizations closes #242 2015-11-13 16:48:51 +00:00
gigabit101
cc2b6a8df3 All machines can now be powered with batteries 2015-11-13 16:40:01 +00:00
gigabit101
0ebf0c95dd more charge slots 2015-11-13 16:29:35 +00:00
gigabit101
a74910e763 Some work on charge slots 2015-11-13 16:08:50 +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
2331e3c35d Fixes #255 and fixes #258 2015-11-12 21:38:11 +00:00
Modmuss50
61a600713a Charge bench now supports higher teir items. 2015-11-12 21:28:49 +00:00
gigabit101
c4b50b5c79 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-11-12 21:01:53 +00:00
gigabit101
da631dd25e Fixed Isidedness of Centrifuge closes #262 2015-11-12 21:01:36 +00:00
Modmuss50
08a3636e72 Fixes #260 2015-11-12 21:00:03 +00:00
gigabit101
a499cf2b09 Removed fake output slot from rolling machine closes #259 2015-11-12 20:50:58 +00:00
gigabit101
322cc072a8 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-11-12 20:46:44 +00:00
gigabit101
4d6f961b9c Fixed Implosion Compressor gui closes #261 2015-11-12 20:46:37 +00:00
Modmuss50
c0665e5c80 Fixes #257 2015-11-12 20:41:01 +00:00
gigabit101
320d06e39e Fixed Digital Chest not counting the ItemStack in output slot 2015-11-12 20:22:41 +00:00
gigabit101
d9654782fe Fixed stack issue with Quantum/Digital Chest 2015-11-12 20:12:15 +00:00
Modmuss50
7e07320844 Removed unused imports 2015-11-12 19:50:20 +00:00
Modmuss50
5419067213 Work for #242 2015-11-12 08:32:14 +00:00
Modmuss50
d562e1222a fixes #219 again 2015-11-12 08:22:47 +00:00
gigabit101
c2dcaf1902 Fixed Quantum Chest/Digital Chest stored items closes #247 2015-11-11 21:37:31 +00:00
Modmuss50
9b6383a548 fixes #251 2015-11-11 18:38:43 +00:00
Modmuss50
25158d872f Removed explosions when raining 2015-11-11 18:33:15 +00:00
Modmuss50
351d7afadb Update reborn core 2015-11-11 17:37:14 +00:00
Modmuss50
85e7bfacde Added ore unifier, disbled by defualt. 2015-11-11 17:25:55 +00:00
Modmuss50
c120c37723 Fixes #250 2015-11-11 17:12:59 +00:00
Modmuss50
08b570ea36 Fixes #244 2015-11-11 17:08:41 +00:00
Modmuss50
842fa421ae Fixes #243 2015-11-11 17:00:18 +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
f4a3e87ebb Fixes #233 2015-11-11 15:54:19 +00:00
Modmuss50
e4760e559b Fixes #249 2015-11-11 15:30:03 +00:00
Modmuss50
6ab71cb612 Fixed compile error 2015-11-11 15:28:20 +00:00
Modmuss50
47a466ef21 Some fixes for #242 2015-11-11 15:24:13 +00:00
Modmuss50
7135075ac6 Removed power indicator on sawmill 2015-11-11 15:17:24 +00:00
Modmuss50
1618a5ca6d Work for #243 The charge bench has no texture 2015-11-11 13:20:03 +00:00
Modmuss50
701c658323 Fixes all of #242 2015-11-11 13:17:14 +00:00
Modmuss50
faa1d079cd Added a handfull of recipes for #182 2015-11-11 11:21:10 +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
a8bcb76db6 Revert "Now checks that an item in a stack is not null, will throw a NPE if one is found."
This reverts commit a483d48a2f.
2015-11-08 19:46:11 +00:00
modmuss50
bde2abe01d Removed scala import 2015-11-08 17:58:07 +00:00
modmuss50
a483d48a2f Now checks that an item in a stack is not null, will throw a NPE if one is found. 2015-11-08 17:45:32 +00:00
modmuss50
d4222693c0 Cleaned up Item Power System 2015-11-08 13:59:36 +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