Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts: # build.gradle # src/main/java/techreborn/TechReborn.java # src/main/java/techreborn/blocks/BlockNuke.java # src/main/java/techreborn/blocks/BlockOre.java # src/main/java/techreborn/blocks/BlockRubberLog.java # src/main/java/techreborn/blocks/generator/BlockSolarPanel.java # src/main/java/techreborn/client/RegisterItemJsons.java # src/main/java/techreborn/client/container/builder/BuiltContainer.java # src/main/java/techreborn/client/container/builder/ContainerBuilder.java # src/main/java/techreborn/client/container/builder/ContainerPlayerInventoryBuilder.java # src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java # src/main/java/techreborn/client/container/builder/slot/FilteredSlot.java # src/main/java/techreborn/client/container/builder/slot/SpriteSlot.java # src/main/java/techreborn/client/container/builder/slot/UpgradeSlot.java # src/main/java/techreborn/client/gui/GuiAESU.java # src/main/java/techreborn/client/gui/GuiAlloySmelter.java # src/main/java/techreborn/client/gui/GuiAssemblingMachine.java # src/main/java/techreborn/client/gui/GuiBase.java # src/main/java/techreborn/client/gui/GuiBlastFurnace.java # src/main/java/techreborn/client/gui/GuiChemicalReactor.java # src/main/java/techreborn/client/gui/GuiCompressor.java # src/main/java/techreborn/client/gui/GuiDieselGenerator.java # src/main/java/techreborn/client/gui/GuiDigitalChest.java # src/main/java/techreborn/client/gui/GuiDistillationTower.java # src/main/java/techreborn/client/gui/GuiElectricFurnace.java # src/main/java/techreborn/client/gui/GuiExtractor.java # src/main/java/techreborn/client/gui/GuiFluidReplicator.java # src/main/java/techreborn/client/gui/GuiFusionReactor.java # src/main/java/techreborn/client/gui/GuiGasTurbine.java # src/main/java/techreborn/client/gui/GuiGenerator.java # src/main/java/techreborn/client/gui/GuiGrinder.java # src/main/java/techreborn/client/gui/GuiImplosionCompressor.java # src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java # src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java # src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java # src/main/java/techreborn/client/gui/GuiIronFurnace.java # src/main/java/techreborn/client/gui/GuiManual.java # src/main/java/techreborn/client/gui/GuiQuantumChest.java # src/main/java/techreborn/client/gui/GuiRecycler.java # src/main/java/techreborn/client/gui/GuiScrapboxinator.java # src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java # src/main/java/techreborn/client/gui/GuiThermalGenerator.java # src/main/java/techreborn/client/gui/GuiVacuumFreezer.java # src/main/java/techreborn/client/gui/TRBuilder.java # src/main/java/techreborn/client/gui/slot/GuiFluidConfiguration.java # src/main/java/techreborn/client/gui/slot/GuiSlotConfiguration.java # src/main/java/techreborn/client/gui/slot/elements/CheckBoxElement.java # src/main/java/techreborn/client/gui/slot/elements/ConfigSlotElement.java # src/main/java/techreborn/client/gui/slot/elements/ElementBase.java # src/main/java/techreborn/client/gui/slot/elements/FluidConfigPopupElement.java # src/main/java/techreborn/client/gui/slot/elements/ISprite.java # src/main/java/techreborn/client/gui/slot/elements/OffsetSprite.java # src/main/java/techreborn/client/gui/slot/elements/SlotConfigPopupElement.java # src/main/java/techreborn/client/gui/slot/elements/Sprite.java # src/main/java/techreborn/compat/CompatManager.java # src/main/java/techreborn/compat/ICompatModule.java # src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java # src/main/java/techreborn/compat/jei/BuiltContainerTransferInfo.java # src/main/java/techreborn/compat/jei/RecipeUtil.java # src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java # src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java # src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java # src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeWrapper.java # src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeWrapper.java # src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java # src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java # src/main/java/techreborn/compat/jei/compressor/CompressorRecipeWrapper.java # src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeWrapper.java # src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeWrapper.java # src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeWrapper.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/generators/fluid/FluidGeneratorRecipeWrapper.java # src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java # src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java # src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeWrapper.java # src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java # src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java # src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeCategory.java # src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java # src/main/java/techreborn/events/BlockBreakHandler.java # src/main/java/techreborn/events/StackToolTipEvent.java # src/main/java/techreborn/init/IC2Duplicates.java # src/main/java/techreborn/init/ModItems.java # src/main/java/techreborn/init/ModRecipes.java # src/main/java/techreborn/init/OreDict.java # src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java # src/main/java/techreborn/init/recipes/ChemicalReactorRecipes.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/IndustrialSawmillRecipes.java # src/main/java/techreborn/init/recipes/RollingMachineRecipes.java # src/main/java/techreborn/init/recipes/ScrapboxRecipes.java # src/main/java/techreborn/items/ItemDestructopack.java # src/main/java/techreborn/items/ItemFrequencyTransmitter.java # src/main/java/techreborn/items/ItemManual.java # src/main/java/techreborn/items/ItemMissingRecipe.java # src/main/java/techreborn/items/ItemScrapBox.java # src/main/java/techreborn/items/ItemTechManual.java # src/main/java/techreborn/items/ItemUUmatter.java # src/main/java/techreborn/items/ItemUpgrade.java # src/main/java/techreborn/items/ItemUpgrades.java # src/main/java/techreborn/items/armor/ItemCloakingDevice.java # src/main/java/techreborn/items/ingredients/ItemDusts.java # src/main/java/techreborn/items/ingredients/ItemDustsSmall.java # src/main/java/techreborn/items/ingredients/ItemGems.java # src/main/java/techreborn/items/ingredients/ItemIngots.java # src/main/java/techreborn/items/ingredients/ItemNuggets.java # src/main/java/techreborn/items/ingredients/ItemParts.java # src/main/java/techreborn/items/ingredients/ItemPlates.java # src/main/java/techreborn/items/ingredients/ItemUUmatter.java # src/main/java/techreborn/items/tool/ItemDebugTool.java # src/main/java/techreborn/items/tool/ItemTreeTap.java # src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java # src/main/java/techreborn/items/tools/ItemTechManual.java # src/main/java/techreborn/items/tools/ItemTreeTap.java # src/main/java/techreborn/items/tools/ItemWrench.java # src/main/java/techreborn/lib/ModInfo.java # src/main/java/techreborn/proxies/ClientProxy.java # src/main/java/techreborn/tiles/TileChargeOMat.java # src/main/java/techreborn/tiles/TileChunkLoader.java # src/main/java/techreborn/tiles/TileDigitalChest.java # src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java # src/main/java/techreborn/tiles/TileMatterFabricator.java # src/main/java/techreborn/tiles/TileQuantumChest.java # src/main/java/techreborn/tiles/TileQuantumTank.java # src/main/java/techreborn/tiles/cable/TileCable.java # src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java # src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java # src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java # src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java # src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java # src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java # src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java # src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java # src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java # src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java # src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java # src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java # src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java # src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java # src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java # src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java # src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java # src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java # src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java # src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java # src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java # src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java # src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java # src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java # src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.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/tier1/TileScrapboxinator.java # src/main/java/techreborn/tiles/storage/TileAdjustableSU.java # src/main/java/techreborn/tiles/storage/TileEnergyStorage.java # src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java # src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java # src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java # src/main/java/techreborn/tiles/storage/idsu/TileInterdimensionalSU.java # src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java # src/main/java/techreborn/utils/StackWIPHandler.java # src/main/java/techreborn/world/TechRebornRetroGen.java # src/main/resources/assets/techreborn/textures/items/armor/lithium_batpack.png
This commit is contained in:
commit
4440c2f305
148 changed files with 1016 additions and 5344 deletions
|
@ -1,6 +1,4 @@
|
|||
|
||||
item.missingRecipe.name=Missing Recipe Placeholder
|
||||
|
||||
itemGroup.techreborn=Tech Reborn
|
||||
|
||||
#Machines
|
||||
|
@ -488,43 +486,49 @@ item.techreborn.part.coolant_triple.name=30k Coolant Cell
|
|||
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
|
||||
|
||||
#Tools
|
||||
item.techreborn.rockcutter.name=Rockcutter
|
||||
item.techreborn.lithiumbatpack.name=Lithium Batpack
|
||||
item.techreborn.lapotronpack.name=Lapotronic Orbpack
|
||||
item.techreborn.omniTool.name=Omni-Tool
|
||||
item.techreborn.ironDrill.name=Steel Drill
|
||||
item.techreborn.diamondDrill.name=Diamond Drill
|
||||
item.techreborn.advancedDrill.name=Advanced Drill
|
||||
item.techreborn.ironChainsaw.name=Steel Chainsaw
|
||||
item.techreborn.diamondChainsaw.name=Diamond Chainsaw
|
||||
item.techreborn.advancedChainsaw.name=Advanced Chainsaw
|
||||
item.techreborn.lapotronicorb.name=Lapotronic Energy Orb
|
||||
#Items-Armor
|
||||
item.techreborn.cloakingdevice.name=Cloaking Device
|
||||
item.techreborn.steelJackhammer.name=Steel Jackhammer
|
||||
item.techreborn.diamondJackhammer.name=Diamond Jackhammer
|
||||
item.techreborn.advancedJackhammer.name=Advanced Jackhammer
|
||||
item.techreborn.frequencyTransmitter.name=Frequency Transmitter
|
||||
item.techreborn.cell.name=Empty Cell
|
||||
item.techreborn.cell.fluid.name=$fluid$ Cell
|
||||
item.techreborn.rebattery.name=Battery
|
||||
item.techreborn.lithiumBattery.name=Lithium Battery
|
||||
item.techreborn.lapotronpack.name=Lapotronic Orbpack
|
||||
item.techreborn.lithiumbatpack.name=Lithium Batpack
|
||||
|
||||
#Items-Battery
|
||||
item.techreborn.energyCrystal.name=Energy Crystal
|
||||
item.techreborn.lapotronCrystal.name=Lapotron Crystal
|
||||
item.techreborn.treetap.name=Treetap
|
||||
item.techreborn.lapotronicorb.name=Lapotronic Energy Orb
|
||||
item.techreborn.lithiumBattery.name=Lithium Battery
|
||||
item.techreborn.rebattery.name=Battery
|
||||
|
||||
#Items-Tools
|
||||
item.techreborn.advancedChainsaw.name=Advanced Chainsaw
|
||||
item.techreborn.advancedDrill.name=Advanced Drill
|
||||
item.techreborn.advancedJackhammer.name=Advanced Jackhammer
|
||||
item.techreborn.debug.name=Debug Tool
|
||||
item.techreborn.diamondChainsaw.name=Diamond Chainsaw
|
||||
item.techreborn.diamondDrill.name=Diamond Drill
|
||||
item.techreborn.diamondJackhammer.name=Diamond Jackhammer
|
||||
item.techreborn.electric_treetap.name=Electric Treetap
|
||||
item.techreborn.nanosaber.name=Nanosaber
|
||||
item.techreborn.omniTool.name=Omni-Tool
|
||||
item.techreborn.rockcutter.name=Rockcutter
|
||||
item.techreborn.ironChainsaw.name=Steel Chainsaw
|
||||
item.techreborn.ironDrill.name=Steel Drill
|
||||
item.techreborn.steelJackhammer.name=Steel Jackhammer
|
||||
item.techreborn.treetap.name=Treetap
|
||||
item.techreborn.wrench.name=Wrench
|
||||
|
||||
#Items-Misc
|
||||
item.techreborn.cell.name=Empty Cell
|
||||
item.techreborn.cell.fluid.name=$fluid$ Cell
|
||||
item.techreborn.frequencyTransmitter.name=Frequency Transmitter
|
||||
item.techreborn.manual.name=Tech Reborn Manual
|
||||
item.techreborn.missingRecipe.name=Missing Recipe Placeholder
|
||||
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.ejection.name=Ejector Upgrade
|
||||
item.techreborn.upgrade.injection.name=Importer Upgrade
|
||||
item.techreborn.electric_treetap.name=Electric Treetap
|
||||
item.techreborn.uuMatter.name=UU-Matter
|
||||
item.techreborn.manual.name=Tech Manual
|
||||
item.techreborn.debug.name=Debug Tool
|
||||
item.techreborn.wrench.name=Wrench
|
||||
item.techreborn.scrapbox.name=Scrap Box
|
||||
|
||||
|
||||
item.bronzeSword.name=Bronze Sword
|
||||
item.bronzePickaxe.name=Bronze Pickaxe
|
||||
|
@ -585,10 +589,6 @@ techreborn.message.nanosaberInactive=Inactive
|
|||
techreborn.message.nanosaberEnergyErrorTo=Not Enough Energy to
|
||||
techreborn.message.nanosaberEnergyError=Not Enough Energy:
|
||||
|
||||
desc.uninsulatedCable=Damages Entities!
|
||||
desc.transfer=Energy Transfer:
|
||||
desc.tier=Tier:
|
||||
|
||||
keys.techreborn.category=TechReborn Category
|
||||
keys.techreborn.config=Config
|
||||
|
||||
|
@ -597,12 +597,13 @@ techreborn.jei.recipe.start.cost=Start: %s
|
|||
techreborn.jei.recipe.running.cost=%s/t: %s
|
||||
techreborn.jei.recipe.processing.time.1=Time: %s ticks
|
||||
techreborn.jei.recipe.processing.time.2=(%s sec)
|
||||
jei.techreborn.scrapbox.name=Opening Scrapboxes
|
||||
techreborn.desc.rubberSap=In order to get sap, you need to find a rubber tree or obtain a rubber tree sapling and proceed to grow it. Once you have obtained a rubber tree, search around for little yellowish spots on the tree. If you don't see any, just wait a bit and eventually these yellow "sap" spots. To harvest the sap, use a treetap and use it on the log.
|
||||
techreborn.desc.scrapBox=Scrapboxes can be opened by either a simple use in hand, or by dispensers. That's right, just throw your scrapboxes into dispensers and give them a redstone signal, and boom! Random item!
|
||||
techreborn.desc.scrapBoxNoDispenser=Scrapboxes can be opened by a simple use in hand!
|
||||
|
||||
techreborn.jei.desc.rubberSap=In order to get sap, you need to find a rubber tree or obtain a rubber tree sapling and proceed to grow it. Once you have obtained a rubber tree, search around for little yellowish spots on the tree. If you don't see any, just wait a bit and eventually these yellow "sap" spots. To harvest the sap, use a treetap and use it on the log.
|
||||
techreborn.jei.desc.scrapBox=Scrapboxes can be opened by either a simple use in hand, or by dispensers. That's right, just throw your scrapboxes into dispensers and give them a redstone signal, and boom! Random item!
|
||||
techreborn.jei.desc.scrapBoxNoDispenser=Scrapboxes can be opened by a simple use in hand!
|
||||
|
||||
techreborn.jei.category.alloy.furnace=Alloy Furnace
|
||||
techreborn.jei.category.scrapbox=Opening Scrapboxes
|
||||
techreborn.jei.category.generator.gas=Gas Generator
|
||||
techreborn.jei.category.generator.semifluid=Semifluid Generator
|
||||
techreborn.jei.category.generator.diesel=Diesel Generator
|
||||
|
@ -612,18 +613,15 @@ techreborn.jei.category.generator.plasma=Plasma Generator
|
|||
#Death Messages
|
||||
death.attack.shock=%s was electrocuted
|
||||
|
||||
|
||||
#Entitys
|
||||
#Entities
|
||||
entity.nuke.name=Nuke
|
||||
|
||||
#Tooltips
|
||||
tooltip.wip=WIP Coming Soon
|
||||
tooltip.upBroken=Upgrades DO NOT function!
|
||||
tooltip.ingredient=Currently only a crafting ingredient
|
||||
techreborn.tooltip.inventory=Inventory
|
||||
techreborn.tooltip.upgrades=Upgrades
|
||||
techreborn.tooltip.transferRate=Transfer Rate
|
||||
techreborn.tooltip.tier=Tier
|
||||
techreborn.tooltip.wip=WIP Coming Soon
|
||||
techreborn.tooltip.inventory=Inventory
|
||||
techreborn.tooltip.upgrades=Upgrades
|
||||
techreborn.tooltip.alarm=Shift rightclick to change sound
|
||||
|
||||
#ManualUI
|
||||
|
@ -633,7 +631,6 @@ techreborn.manual.wikibtn=Open
|
|||
techreborn.manual.discordbtn=Join
|
||||
|
||||
#Advancements
|
||||
|
||||
advancements.techreborn.root.desc=Now that you have acquired Tech Reborn ore, you might find a tree tap usefull.
|
||||
advancements.techreborn.treetap=TreeTap
|
||||
advancements.techreborn.treetap.desc=Now that you have crafted a tree tap you will want to use it on a sap spot on a rubber tree.
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
Before Width: | Height: | Size: 14 KiB |
Binary file not shown.
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 552 B |
Loading…
Add table
Add a link
Reference in a new issue