TechReborn/src/main/java/techreborn/blocks
modmuss50 e51f3f7c51 Merge remote-tracking branch 'origin/1.12' into 1.12
# Conflicts:
#	src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
2017-09-28 21:04:02 +01:00
..
advanced_machine Fix unused imports 2017-09-09 01:54:43 +03:00
cable Add support for wrenches from other mods. 2017-09-28 21:01:38 +01:00
fluid Fix warnings 2017-09-14 17:55:28 +03:00
generator Fix unused imports 2017-09-09 01:54:43 +03:00
iron_machines Fix unused imports 2017-09-09 01:54:43 +03:00
machine Fix unused imports 2017-09-09 01:54:43 +03:00
storage Merge remote-tracking branch 'origin/1.12' into 1.12 2017-09-28 21:04:02 +01:00
tier1 Refactoring for translation 2017-09-08 02:03:35 +03:00
transformers Added check for config for block break with pickaxe. Closes #1172 2017-09-28 02:03:16 +03:00
BlockAutoCraftingTable.java Added player detector recipe. Removed unused imports 2017-09-07 03:17:40 +03:00
BlockComputerCube.java Added player detector recipe. Removed unused imports 2017-09-07 03:17:40 +03:00
BlockDigitalChest.java Fixed check for max storage for chests. Closes #1026 2017-09-22 04:03:20 +03:00
BlockFlare.java Auto format code 2017-06-12 14:23:32 +01:00
BlockFusionCoil.java 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
BlockFusionControlComputer.java Added player detector recipe. Removed unused imports 2017-09-07 03:17:40 +03:00
BlockMachineCasing.java Fix the rest of the models & remove manual and heat generator 2017-06-16 08:20:30 -07:00
BlockMachineFrames.java More refactoring for recipes. Also closes #1225 and #1223 and #1190 (#1245) 2017-08-23 17:10:06 -07:00
BlockNuke.java Fixed missing nuke textures 2017-09-07 00:13:37 +03:00
BlockOre.java Recipes are now added to the recipe book when a tree tap is used. 2017-06-15 11:35:08 +01:00
BlockOre2.java Recipes are now added to the recipe book when a tree tap is used. 2017-06-15 11:35:08 +01:00
BlockPlayerDetector.java Fixed tooltip issue. Closes #865 2017-09-07 18:29:52 +03:00
BlockPump.java Added license info to the header of all files. 2017-02-23 12:29:43 +00:00
BlockQuantumChest.java Fixed check for max storage for chests. Closes #1026 2017-09-22 04:03:20 +03:00
BlockQuantumTank.java Added player detector recipe. Removed unused imports 2017-09-07 03:17:40 +03:00
BlockRefinedIronFence.java Auto format code 2017-06-28 20:54:12 +01:00
BlockReinforcedGlass.java Fix the rest of the models & remove manual and heat generator 2017-06-16 08:20:30 -07:00
BlockRubberLeaves.java Fix leaf rendering 2017-06-20 22:13:47 +01:00
BlockRubberLog.java Added player detector recipe. Removed unused imports 2017-09-07 03:17:40 +03:00
BlockRubberPlank.java 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
BlockRubberSapling.java 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
BlockStorage.java Fix unused imports 2017-09-09 01:54:43 +03:00
BlockStorage2.java Made iridium reinforced blocks more blast resistant. Closes #1259 2017-09-02 01:30:36 +03:00
BlockSupercondensator.java Added player detector recipe. Removed unused imports 2017-09-07 03:17:40 +03:00