Commit graph

484 commits

Author SHA1 Message Date
modmuss50
ff1370a3fd Fix opening guis, still needs some work, but atleast it works now 2019-03-02 18:45:33 +00:00
modmuss50
001dd9ac74 Basic work on the genResources task 2019-03-01 21:24:26 +00:00
modmuss50
db3a6f2c7e Enough to get the game running 2019-02-23 23:51:37 +00:00
modmuss50
fd0fa8c66e Bunch of item work, 96 2019-02-22 15:02:41 +00:00
drcrazy
647b126c98 Updated mappings 2019-02-22 14:36:13 +03:00
modmuss50
df8c2cd34b 1.13.2 2019-02-20 20:27:03 +00:00
drcrazy
5bc08557b3 Migration work on TR armor 2019-02-20 23:12:36 +03:00
modmuss50
368e2d48df 2123 - Gradle setup 2019-01-12 19:56:42 +00:00
modmuss50
4440c2f305 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
2018-12-26 16:08:04 +00:00
modmuss50
e299518c4e #releaseBuild 2018-12-20 11:18:35 +00:00
modmuss50
08b8039e9f #releaseBuild 2018-12-09 14:06:58 +00:00
modmuss50
0d9e98b370 Cleanup ic2 support 2018-12-09 00:24:52 +00:00
modmuss50
1dd864f467 #releaseBuild Large refactor, ensure you update TechReborn and RebornCore 2018-12-08 16:43:07 +00:00
modmuss50
e7604cd9ce #betaBuild 2018-11-30 17:26:10 +00:00
modmuss50
385a5ea8b5 Include TechReborn Mod Compatibility using jar in jar 2018-11-16 16:51:26 +00:00
modmuss50
dc64b26655 Fix build? 2018-11-16 15:47:06 +00:00
modmuss50
aa0ffe7559 Stage one of moving compat code out into a separate project 2018-11-16 15:44:33 +00:00
modmuss50
891e2ea13b Add ae2 api to try and fix and odd crash with mekanism 2018-11-16 13:25:41 +00:00
modmuss50
609b86c46f #releaseBuild 2018-11-15 12:35:34 +00:00
modmuss50
f808c61a51 Use mekanism's gas registry to register mek gases to be used in the gas turbine. Closes #1575
Remove some old psi compat code as well as it was never used
2018-11-15 12:24:42 +00:00
Modmuss50
05fff8f9b6
#releaseBuild 2018-11-01 09:11:02 +00:00
Modmuss50
eee87e3ecd
Fix running in dev?
I havent tested this, lets hope github web edit can save the day
2018-10-18 17:29:51 +01:00
drcrazy
4c956e39f6 Fix dependencies 2018-10-08 18:37:26 +03:00
drcrazy
2eb53c3589 Updated forge to 14.23.5.2768 2018-10-08 16:59:21 +03:00
modmuss50
3c7c5cbaa1 Fix build #releaseBuild 2018-10-07 22:54:50 +01:00
modmuss50
f45bdcee9b Fix build 2018-10-07 22:49:02 +01:00
modmuss50
fa31f62426 #releaseBuild 2018-10-07 22:05:08 +01:00
modmuss50
0dae241e38 #releaseBuild 2018-09-19 16:47:55 +01:00
ProfessorProspector
269e297d9e 3 2018-09-16 13:52:02 -07:00
ProfessorProspector
e5736669ca Refactoring & cleaning 2018-09-16 13:48:51 -07:00
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
Modmuss50
253abcad48
#releaseBuild 2018-09-02 14:15:57 +01:00
Modmuss50
852c4584a4
Fix language issues 2018-09-02 13:57:41 +01:00
Modmuss50
96c36e272f
#releaseBuild 2018-09-01 23:32:26 +01:00
Modmuss50
cee083eb88
Fix crowdinExport task 2018-08-31 16:00:31 +01:00
Modmuss50
d4e08ba976
Trigger a crowdin export before downloading the translations 2018-08-31 15:29:59 +01:00
Modmuss50
9b0f583cab
Translations are now handled over at https://translate.techreborn.ovh/ using crowdin 2018-08-30 22:47:25 +01:00
drcrazy
be024f0179 Updated forge 2018-08-22 15:55:14 +03:00
Modmuss50
5d17985960
#releaseBuild 2018-08-14 01:10:55 +01:00
Modmuss50
f2c5d71fb7
#releaseBuild 2018-08-12 16:51:13 +01:00
modmuss50
53b450acea
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts:
#	src/main/java/techreborn/compat/immersiveengineering/RecipeImmersiveEngineering.java
#	src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java
2018-08-03 18:04:40 +01:00
modmuss50
1cd5e06757
#releaseBuild 2018-08-03 17:58:12 +01:00
modmuss50
c461dd8cf5
#releaseBuild 2018-08-02 19:18:01 +01:00
modmuss50
f5c6b59ebd
Mappings 2018-07-20 22:31:20 +01:00
modmuss50
b65e963f12
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
The new mod compatibility will be included (either shaded or jar-in-jar) in the main TR distrubtion, this has been done to aid development
2018-07-19 10:48:37 +01:00
drcrazy
525e85dd4a #releaseBuild 2018-06-27 17:03:16 +03:00
drcrazy
ec13f82628 Updated OC version. 2018-06-22 15:40:32 +03:00
Prospector
ac9c01555f Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12-v2.16 2018-06-12 15:13:23 -07:00
Prospector
7e794894a3 Add a gradle task to output libs 2018-06-12 15:13:17 -07:00
modmuss50
4d4aea51a6
#releaseBuild 2018-06-10 12:00:08 +01:00