TechReborn/src/main/java/techreborn
modmuss50 e3749343e7 Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/compat/rei/MachineRecipeCategory.java
#	src/main/java/techreborn/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java
#	src/main/java/techreborn/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java
2020-03-12 20:33:54 +00:00
..
api License updates + fixes 2020-01-03 22:46:07 +00:00
blockentity Merge remote-tracking branch 'remotes/origin/1.15' into 1.16 2020-03-12 20:33:54 +00:00
blocks initial 20w11a 2020-03-12 20:32:03 +00:00
client initial 20w11a 2020-03-12 20:32:03 +00:00
compat improved rei compat (#2054) 2020-03-05 19:24:29 +00:00
config Review nanosaber config 2020-01-24 16:01:56 +03:00
entities initial 20w11a 2020-03-12 20:32:03 +00:00
events Lineup batteries and energy storages. 2020-01-13 15:38:23 +03:00
init initial 20w11a 2020-03-12 20:32:03 +00:00
items Merge remote-tracking branch 'remotes/origin/1.15' into 1.16 2020-03-12 20:33:54 +00:00
multiblocks License updates + fixes 2020-01-03 22:46:07 +00:00
packets License updates + fixes 2020-01-03 22:46:07 +00:00
utils Allow to keep enchants only for TR items. Closes #1952 2020-03-10 13:51:34 +03:00
world 1.16 2020-02-12 18:36:01 +00:00
TechReborn.java Redstone config polish 2020-01-23 13:53:16 +00:00
TechRebornClient.java Fix various issues relating to armor [Fixes #1952] 2020-01-12 19:17:35 -08:00