Merge remote-tracking branch 'remotes/origin/1.12' into 1.13

# Conflicts:
#	build.gradle
#	src/main/java/techreborn/Core.java
#	src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java
#	src/main/java/techreborn/api/recipe/recipes/BlastFurnaceRecipe.java
#	src/main/java/techreborn/blocks/BlockMachineCasing.java
#	src/main/java/techreborn/blocks/cable/EnumCableType.java
#	src/main/java/techreborn/blocks/generator/solarpanel/BlockSolarPanel.java
#	src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
#	src/main/java/techreborn/blocks/transformers/BlockTransformer.java
#	src/main/java/techreborn/client/gui/GuiAESU.java
#	src/main/java/techreborn/client/gui/GuiManual.java
#	src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
#	src/main/java/techreborn/command/TechRebornDevCommand.java
#	src/main/java/techreborn/compat/jei/RecipeUtil.java
#	src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
#	src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java
#	src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java
#	src/main/java/techreborn/config/ConfigTechReborn.java
#	src/main/java/techreborn/init/IC2Duplicates.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/init/OreDict.java
#	src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
#	src/main/java/techreborn/init/recipes/FusionReactorRecipes.java
#	src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java
#	src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java
#	src/main/java/techreborn/init/recipes/SmeltingRecipes.java
#	src/main/java/techreborn/items/ItemUpgrades.java
#	src/main/java/techreborn/items/ingredients/ItemParts.java
#	src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java
#	src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java
#	src/main/java/techreborn/items/tools/ItemWrench.java
#	src/main/java/techreborn/tiles/TileAlarm.java
#	src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java
#	src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java
#	src/main/java/techreborn/tiles/generator/TileLightningRod.java
#	src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java
#	src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java
#	src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java
#	src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java
#	src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java
#	src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java
#	src/main/java/techreborn/tiles/machine/tier3/TileMatterFabricator.java
#	src/main/java/techreborn/tiles/storage/TileAdjustableSU.java
#	src/main/java/techreborn/world/TechRebornRetroGen.java
#	src/main/resources/assets/techreborn/blockstates/items/materials/part.json
#	src/main/resources/assets/techreborn/blockstates/items/misc/upgrades.json
This commit is contained in:
modmuss50 2019-04-27 20:32:56 +01:00
commit 6ab23c4c64
32 changed files with 668 additions and 54 deletions

View file

@ -45,6 +45,11 @@
"textures": {
"layer0": "techreborn:items/cables/insulatedhv"
}
},
"superconductor": {
"textures": {
"layer0": "techreborn:items/cables/superconductor"
}
}
}
}

View file

@ -77,6 +77,11 @@
"textures": {
"cable": "techreborn:blocks/cables/hv_insulated_cable"
}
},
"superconductor": {
"textures": {
"cable": "techreborn:blocks/cables/superconductor_cable"
}
}
}
}

View file

@ -146,6 +146,7 @@ tile.techreborn.cable.glassfiber.name=Glass Fiber Cable
tile.techreborn.cable.insulatedcopper.name=Insulated Copper Cable
tile.techreborn.cable.insulatedgold.name=Insulated Gold Cable
tile.techreborn.cable.insulatedhv.name=Insulated HV Cable
tile.techreborn.cable.superconductor.name=Superconductor Cable
#Fluid blocks
tile.techreborn.berylium.name=Beryllium
@ -487,6 +488,7 @@ item.techreborn.part.coolant_six.name=60k Coolant Cell
item.techreborn.part.carbon_mesh.name=Carbon Mesh
item.techreborn.part.carbon_fiber.name=Carbon Fiber
item.techreborn.part.uuMatter.name=UU-Matter
item.techreborn.part.enhanced_super_conductor.name=Enhanced Superconductor
#Items-Armor
item.techreborn.cloakingdevice.name=Cloaking Device
@ -528,6 +530,7 @@ item.techreborn.scrapbox.name=Scrap Box
item.techreborn.upgrade.overclock.name=Overclocker Upgrade
item.techreborn.upgrade.transformer.name=Transformer Upgrade
item.techreborn.upgrade.energy_storage.name=Energy Storage Upgrade
item.techreborn.upgrade.superconductor.name=Superconductor Upgrade
item.bronzeSword.name=Bronze Sword
@ -627,8 +630,10 @@ techreborn.tooltip.alarm=Shift rightclick to change sound
#ManualUI
techreborn.manual.wiki=Online wiki
techreborn.manual.discord=Our discord
techreborn.manual.refund=I want a refund
techreborn.manual.wikibtn=Open
techreborn.manual.discordbtn=Join
techreborn.manual.refundbtn=Refund
#Advancements
advancements.techreborn.root.desc=Now that you have acquired Tech Reborn ore, you might find a tree tap usefull.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 552 B

After

Width:  |  Height:  |  Size: 1.9 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 552 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB