TechReborn/src/main/java/techreborn/tiles
Modmuss50 6060a97855
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts:
#	src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java
#	src/main/java/techreborn/client/container/ContainerPda.java
#	src/main/java/techreborn/client/gui/TRBuilder.java
#	src/main/java/techreborn/compat/crafttweaker/CTFusionReactor.java
#	src/main/java/techreborn/compat/crafttweaker/CTGeneric.java
#	src/main/java/techreborn/compat/jei/RecipeUtil.java
#	src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
#	src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java
#	src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java
#	src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java
#	src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java
#	src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/compressor/CompressorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeCategory.java
#	src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java
#	src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java
#	src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeCategory.java
#	src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java
#	src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java
#	src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java
#	src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java
#	src/main/java/techreborn/init/ModBlocks.java
#	src/main/java/techreborn/init/ModTileEntities.java
#	src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
#	src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java
#	src/main/java/techreborn/items/tools/ItemAdvancedDrill.java
#	src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java
#	src/main/resources/assets/techreborn/lang/en_us.lang
#	src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json
#	src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json
#	src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json
#	src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json
#	src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json
#	src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json
2018-09-05 17:49:49 +01:00
..
cable More formatting changes. 2018-06-23 19:00:44 +03:00
fusionReactor More formatting changes. 2018-06-23 19:00:44 +03:00
generator Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep 2018-09-05 17:49:49 +01:00
idsu Lot of formatting. 2018-06-22 18:22:16 +03:00
lesu Mappings 2018-07-20 22:31:20 +01:00
lighting Lot of formatting. 2018-06-22 18:22:16 +03:00
multiblock Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep 2018-09-05 17:49:49 +01:00
storage Move all mod compatibility out into its own mod, ic2 support is gone and will come back in some more basic form once ic2 is on 1.13 2018-07-19 10:48:37 +01:00
tier0 Fix incorrect usage of item stack checking 2018-06-25 12:34:13 +01:00
tier1 Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep 2018-09-05 17:49:49 +01:00
transformers Lot of formatting. 2018-06-22 18:22:16 +03:00
TileAlarm.java Lot of formatting. 2018-06-22 18:22:16 +03:00
TileChargeOMat.java Move all mod compatibility out into its own mod, ic2 support is gone and will come back in some more basic form once ic2 is on 1.13 2018-07-19 10:48:37 +01:00
TileChunkLoader.java Lot of formatting. 2018-06-22 18:22:16 +03:00
TileCreativeQuantumChest.java 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
TileCreativeQuantumTank.java Update licenses 2018-08-12 16:36:16 +01:00
TileDigitalChest.java Lot of formatting. 2018-06-22 18:22:16 +03:00
TileEntityFlare.java Update year in license 2018-02-11 14:08:13 +00:00
TileGenericMachine.java Lot of formatting. 2018-06-22 18:22:16 +03:00
TileIndustrialCentrifuge.java Last piece of refactoring due to TileGenericMachine intro. 2018-04-02 18:12:58 +03:00
TileMachineCasing.java Fixed warnings 2018-07-23 12:55:18 +03:00
TileMatterFabricator.java Renamed ModItems to TRItems. Sorted members inside it. 2018-09-03 17:46:21 +03:00
TilePump.java Initial fluid config work 2018-08-10 17:45:16 +01:00
TileQuantumChest.java Lot of formatting. 2018-06-22 18:22:16 +03:00
TileQuantumTank.java Initial fluid config work 2018-08-10 17:45:16 +01:00
TileTechStorageBase.java Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep 2018-08-03 18:04:40 +01:00