TechReborn/src/main/java/techreborn
modmuss50 3f8128d890 Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 #betabuild
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
#	src/main/java/techreborn/items/tools/ItemWrench.java
2016-12-07 13:52:48 +00:00
..
achievement A bunch more null check \o/ 2016-12-06 18:22:18 +00:00
api Added extra validation to recipe inputs and outputs, fixed one bug because of it. 2016-12-05 11:18:30 +00:00
blocks A bunch more null check \o/ 2016-12-06 18:22:18 +00:00
client Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 #betabuild 2016-12-07 13:52:48 +00:00
command Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 #betabuild 2016-12-07 13:52:48 +00:00
compat Hide Missing recipe item in JEI 2016-12-05 12:50:55 +00:00
config Auto Format code 2016-10-08 20:46:16 +01:00
dev Auto Format code 2016-10-08 20:46:16 +01:00
dispenser Auto Format code 2016-10-08 20:46:16 +01:00
entitys Start on the update 2016-11-19 12:50:08 +00:00
events A bunch more null check \o/ 2016-12-06 18:22:18 +00:00
init Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 #betabuild 2016-12-07 13:52:48 +00:00
itemblocks A bunch more null check \o/ 2016-12-06 18:22:18 +00:00
items Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 #betabuild 2016-12-07 13:52:48 +00:00
lib It compiles, disable JEI as it needs redoing 2016-11-19 14:41:00 +00:00
manual A bunch more null check \o/ 2016-12-06 18:22:18 +00:00
multiblocks Improve block names 2016-12-05 09:40:55 +00:00
packets Auto Format code 2016-10-08 20:46:16 +01:00
parts Auto format 2016-11-25 13:25:51 +00:00
power Fix a load of null issues, and get it to sort of work. 2016-11-19 16:36:13 +00:00
proxies Auto format code. 2016-12-05 10:48:21 +00:00
tiles A bunch more null check \o/ 2016-12-06 18:22:18 +00:00
utils Rename method to reflect the 1.11 changes. 2016-12-05 11:19:37 +00:00
world Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 #betabuild 2016-12-07 13:52:48 +00:00
Core.java Add files back, blame git 2016-11-25 13:38:17 +00:00