Commit graph

9 commits

Author SHA1 Message Date
Modmuss50
4e352c0953
Add creative versions of the Quantum tank and chest, they provide unlimited amount of the specified item/fluid 2018-08-12 16:32:43 +01:00
ProfessorProspector
9ed05fb7ff Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts:
#	src/main/java/techreborn/blocks/BlockAlarm.java
2018-06-14 10:57:07 -07:00
ProfessorProspector
cfda5fd2a4 Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts:
#	src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java
#	src/main/java/techreborn/blocks/generator/BlockWaterMill.java
#	src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
#	src/main/java/techreborn/blocks/storage/BlockLSUStorage.java
#	src/main/java/techreborn/blocks/transformers/BlockTransformer.java
2018-06-14 10:53:32 -07:00
drcrazy
77e1c54b86 Fixed inventory drop for DSU. More work on #1543 2018-06-14 18:32:40 +03:00
drcrazy
42bc110cb2 Fixed build, but DSU blocks are not done yet. 2018-06-13 17:42:46 +03:00
Prospector
6d3b415ddd Unify creative tabs 2018-06-12 15:42:20 -07:00
modmuss50
1c10c199ae Fixes some issues with the storage chests, closes #1481 2018-05-04 12:06:40 +01:00
drcrazy
45669e8aa9 Formatting + set proper frame drop for advanced machines 2018-04-28 13:16:50 +03:00
drcrazy
de61d24082 Sorted out blocks between tiers 2018-04-27 18:06:57 +03:00