TechReborn/src/main/java/techreborn/items
drcrazy eab088c094 Merge branch '1.12' into feature/solar-panles
Conflicts:
	build.gradle
	src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
	src/main/java/techreborn/blocks/lighting/BlockLamp.java
2017-11-28 17:28:47 +03:00
..
armor Removed unused code, added Override annotation 2017-11-12 12:15:32 +03:00
battery Removed unused code, added Override annotation 2017-11-12 12:15:32 +03:00
tools Removed unused code, added Override annotation 2017-11-12 12:15:32 +03:00
DynamicCell.java Fix for machine tank drain. More luv to industrial grinder. (#1254) 2017-08-29 19:57:21 +03:00
ItemCells.java Should fix #1289 2017-10-08 18:56:07 +01:00
ItemDestructopack.java Begin the Great Refactor of Mid-2017 2017-06-13 16:49:52 -07:00
ItemDusts.java Fix unused imports 2017-09-09 01:54:43 +03:00
ItemDustsSmall.java Fix warnings 2017-09-14 17:55:28 +03:00
ItemFrequencyTransmitter.java Removed unused code, added Override annotation 2017-11-12 12:15:32 +03:00
ItemGems.java Fix warnings 2017-09-14 17:55:28 +03:00
ItemIngots.java Fix warnings 2017-09-14 17:55:28 +03:00
ItemMissingRecipe.java Recipes are now added to the recipe book when a tree tap is used. 2017-06-15 11:35:08 +01:00
ItemNuggets.java Fix warnings 2017-09-14 17:55:28 +03:00
ItemParts.java Balance, textures and items 2017-10-27 09:34:55 +03:00
ItemPlates.java Fix warnings 2017-09-14 17:55:28 +03:00
ItemScrapBox.java Begin the Great Refactor of Mid-2017 2017-06-13 16:49:52 -07:00
ItemTR.java Auto format code 2017-06-28 20:54:12 +01:00
ItemUpgrades.java Upgrade merge 2017-10-27 09:34:53 +03:00
ItemUUmatter.java Begin the Great Refactor of Mid-2017 2017-06-13 16:49:52 -07:00