Commit graph

677 commits

Author SHA1 Message Date
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
modmuss50
00b40e99ad
#releaseBuild 2018-06-09 17:05:15 +01:00
modmuss50
c15f808686
#releaseBuild 2018-06-09 12:43:23 +01:00
modmuss50
cc541bd55c
#releaseBuild 2018-06-05 22:12:58 +01:00
modmuss50
6cd98727a8
#releaseBuild 2018-06-02 17:06:23 +01:00
drcrazy
f59a4775a9 Fixed license and updated Thermal and Forge deps 2018-05-30 15:00:54 +03:00
modmuss50
4d74c8d69b
#releaseBuild 2018-05-27 00:42:03 +01:00
modmuss50
c7dcc7a5e3 #releaseBuild 2018-05-21 17:51:33 +01:00
modmuss50
f533782295
#releaseBuild 2018-05-20 16:10:32 +01:00
modmuss50
8cf66a7f1d #releaseBuild 2018-05-16 17:31:18 +01:00
drcrazy
3d2cbe4e74 Updated IC2 and BC versions 2018-05-11 15:00:16 +03:00
modmuss50
bcc9e0827a #releaseBuild 2018-05-09 17:53:05 +01:00
modmuss50
4a7be6844a
#releaseBuild 2018-05-06 12:41:08 +01:00
modmuss50
4c192ec1e8
Add Immersive Engineering Creosote to semi-fluid generator 2018-05-06 12:01:15 +01:00
drcrazy
9a6d9765bd Removed tesla dependency. 2018-05-04 12:01:00 +03:00
modmuss50
c9240f89d0
#releaseBuild 2018-04-28 19:26:19 +01:00
modmuss50
21fc0fe309
#releaseBuild 2018-04-28 12:07:53 +01:00
modmuss50
be97fbb415
#releaseBuild 2018-04-22 18:41:26 +01:00
modmuss50
d9d4c117d3
#releaseBuild 2018-04-22 13:26:18 +01:00
modmuss50
5a2bcdd5b2
#releaseBuild 2018-04-21 16:34:32 +01:00
drcrazy
b12cc56c83 Updated buildcraft version to 7.99.16 2018-04-18 16:01:44 +03:00
modmuss50
6a00ffde5c
#releaseBuild 2018-04-13 16:45:48 +01:00
modmuss50
7b275bebb1
#releaseBuild 2018-04-11 20:17:33 +01:00
modmuss50
626bae1833
#releaseBuild 2018-04-08 21:11:43 +01:00
modmuss50
415d303245
#releaseBuild 2018-04-05 16:14:43 +01:00
modmuss50
d8f3a8b9b0
#releaseBuild 2018-04-04 20:29:25 +01:00
modmuss50
20f0fff58c
#releaseBuild 2018-04-03 18:28:17 +01:00
modmuss50
20849b4a11
Improve CraftTweaker documentation 2018-04-02 10:42:02 +01:00
modmuss50
0648aa1a43
Forge update 2018-03-31 11:28:25 +01:00
modmuss50
281e5ba6a6
#releaseBuild 2018-03-30 19:32:27 +01:00
modmuss50
6aa6183103
#releaseBuild 2018-03-29 22:38:45 +01:00
modmuss50
4ed1071985
#releaseBuild 2018-03-26 16:17:05 +01:00
modmuss50
63b3e68d01 #releaseBuild 2018-03-23 11:07:36 +00:00
modmuss50
1a5299df55 #releaseBuild 2018-03-20 19:47:03 +00:00
modmuss50
32cb8a1b52
#releaseBuild 2018-03-11 13:07:15 +00:00
modmuss50
23b3b7335c #releaseBuild 2018-03-06 21:31:23 +00:00
drcrazy
4a369d0ee7 Updated buildcraft version. More oredict for centrifuge. 2018-02-22 13:35:18 +03:00
modmuss50
87b1fb9200
Should fix gradle 2018-02-19 15:01:37 +00:00
modmuss50
804971bb70
Update gradle + Rewrite maven handling to fix #1442 2018-02-19 14:12:08 +00:00
modmuss50
2180fe4ef2 Initial work on open computers support, more to come in the future.
When things are a bit more final with it, I will add some docs onto the wiki pages.
2018-02-13 23:56:38 +00:00
drcrazy
637d7d4ce9 #releaseBuild 2018-02-13 02:11:03 +03:00
Dimmerworld
9349ffe264 Update forge and Sound options for Alarm (#1435)
* Update forge and Sound options for Alarm

* Revert changes to gradle wrapper properties

* Cleanup imports

* Removed sneaky debugging stuff
2018-02-10 11:53:11 +00:00
Modmuss50
dfa35e2652
Update maven 2018-02-02 09:20:49 +00:00
modmuss50
e711bbbedd Automatically generate basic CraftTweaker documentation on build 2018-01-29 21:14:08 +00:00
drcrazy
b7c758c011 #releaseBuild 2018-01-26 13:26:19 +03:00
modmuss50
e0eb725878 Fix crash when codechicken lib isn't installed. #releaseBuild 2018-01-19 11:19:53 +00:00
drcrazy
ceefa8423a #releaseBuild 2018-01-19 11:20:58 +03:00
drcrazy
a7d302115b Updated dependencies. 2018-01-16 17:30:13 +03:00
drcrazy
c4a0894802 Updated Buildcraft dependency. 2018-01-15 11:59:20 +03:00
Modmuss50
3cbcdc0c00
#releaseBuild
for some reason the last one didnt work.
2017-12-31 16:40:43 +00:00
modmuss50
4f939d5d25
#releaseBuild 2017-12-31 16:19:55 +00:00
drcrazy
b4307e42bd Updated buildcraft version 2017-12-29 16:32:54 +03:00
modmuss50
406e44cbfe
#alphaBuild 2017-12-25 00:26:40 +00:00
modmuss50
b9084d620e
#releaseBuild 2017-12-22 13:15:00 +00:00
modmuss50
15d24d3840
Update libs 2017-12-22 13:14:00 +00:00
modmuss50
677bb59ceb Should hopefully fix server crash #releaseBuild Fixes #1371 2017-12-18 01:48:25 +00:00
modmuss50
5be3163eeb
#releaseBuild 2017-12-17 22:20:28 +00:00
modmuss50
33be3cf35d #releaseBuild 2017-12-11 13:20:40 +00:00
modmuss50
1581ad439c Revert maven changes 2017-12-06 11:05:22 +00:00
modmuss50
73f1fa9a86 Use older version of ic2 that has been cached, should be reverted at a later date. 2017-12-05 17:37:11 +00:00
modmuss50
696e6a9626 Use mod maven to proxy around ic2 maven being down. 2017-12-05 17:32:55 +00:00
drcrazy
5d8c96bf47
#releaseBuild 2017-12-01 23:30:27 +03:00
drcrazy
b2d2be24c6 Updated recipies and fixed build 2017-11-30 16:46:11 +03:00
modmuss50
b8964b6eca Update mappings 2017-11-28 17:25:36 +00:00
modmuss50
850ec54bd3 Bump version #releaseBuild 2017-11-27 09:36:06 +00:00
modmuss50
9aa3d3e59d Added back buildcraft support 2017-11-24 14:59:49 +00:00
drcrazy
f1a179d26e #releaseBuild 2017-11-15 10:40:28 +03:00
drcrazy
14f715ff7b #releaseBuild 2017-11-10 12:59:26 +03:00
modmuss50
dedde645ad
#releaseBuild 2017-11-05 12:05:17 +00:00
Modmuss50
314a41e465
#releaseBuild 2017-10-29 22:24:15 +00:00
modmuss50
709922b708 #releaseBuild 2017-10-12 22:28:32 +01:00
modmuss50
f5e73d23fa #releaseBuild 2017-10-11 17:43:45 +01:00
modmuss50
b990a7aaa9
#releaseBuild 2017-10-08 20:00:11 +01:00
modmuss50
790aa6f826
Update forge 2017-10-08 18:54:59 +01:00
Modmuss50
e80583a1e7 Update forge 2017-10-03 15:52:20 +01:00
drcrazy
e569abbc6f #releaseBuild 2017-10-02 21:12:28 +03:00
modmuss50
27829ea1f2 Merge remote-tracking branch 'origin/1.12' into 1.12 2017-09-28 23:45:04 +01:00
modmuss50
f5076ea8af Downgrade mappings + update all libs 2017-09-28 23:44:16 +01:00
drcrazy
1875d8abb4 #releaseBuild 2017-09-29 01:24:26 +03:00
modmuss50
27bfa618db #releaseBuild 2017-09-18 23:49:13 +01:00
modmuss50
e74067db40 1.12.2 2017-09-18 23:47:07 +01:00
Modmuss50
e9dd765062 #releaseBuild 2017-09-18 23:08:06 +01:00
drcrazy
be88077f8c #releaseBuild 2017-09-16 01:06:26 +03:00
modmuss50
33aaacc8f8 #releaseBuild 2017-09-11 09:35:57 +01:00
drcrazy
c11b79828c #releaseBuild 2017-09-04 00:57:25 +03:00
drcrazy
4ef1c74b1f #releaseBuild 2017-08-29 20:01:15 +03:00
drcrazy
63be913878 Fix for Industrial Grinder. Closes #1155 (#1253)
Fix for tank issue, recipe energy consumption made equal to I\O rate, a
little bit of cleanup
2017-08-28 00:38:10 +03:00
Modmuss50
c401f116aa #releaseBuild include a load of fixes from drcrazy 2017-08-24 17:41:23 +01:00
drcrazy
f465c6cf47 Refactored Crafting Table recipies; Fixed IDE warnings for unused (#1241)
imports; Update CoFH deps to fix build
2017-08-21 14:25:13 -07:00
modmuss50
b0cf304dfa
#releaseBuild 2017-08-16 11:45:00 +01:00
modmuss50
11990301d3
1.12.1 2017-08-15 19:00:37 +01:00
modmuss50
3ea0d2541a
#releaseBuild 2017-07-28 21:10:19 +01:00
modmuss50
0ebd138509
Fix crash with Industrial Foregoing #releaseBuild 2017-07-10 18:44:33 +01:00
modmuss50
68d93e1676
Start work on thermal expansion support #releaseBuild 2017-07-07 00:24:20 +01:00
modmuss50
cead631367
Added a generous amount of recipes into thermal expansion, close #1110 2017-07-06 23:49:00 +01:00
modmuss50
370d07767e
Bump version #releaseBuild 2017-07-06 22:25:31 +01:00
modmuss50
3e4cf9b93f
Fix server kicking client when using the saw mill, closes #1182 #releaseBuild 2017-07-03 21:51:17 +01:00
modmuss50
f182ce1140
Bump version, #releaseBuild 2017-07-03 21:04:27 +01:00
modmuss50
2def66aa31
Bump version, #releaseBuild 2017-07-02 20:25:51 +01:00
modmuss50
768da9961c
Handle ore dict in a better way, fixes invalid ores being registered #releaseBuild 2017-07-02 15:04:37 +01:00
modmuss50
94d9c2cf20
Bump version #releaseBuild 2017-07-01 13:36:16 +01:00
modmuss50
86bee5639c
Bump version #releaseBuild 2017-06-29 13:28:30 +01:00
modmuss50
327bba2775
Merge remote-tracking branch 'origin/1.12' into 1.12 2017-06-29 12:40:41 +01:00
modmuss50
0e8505b072
Remove reminents of core mod + fix powered items 2017-06-29 12:37:06 +01:00
Modmuss50
fc29fefffa #releaseBuild 2017-06-28 23:03:30 +01:00
modmuss50
68b40927c8
Disable it for now 2017-06-28 22:43:48 +01:00
modmuss50
779467ea01
Fix? 2017-06-28 22:29:01 +01:00
modmuss50
5f63bb7b5a
Might fix build? 2017-06-28 21:14:47 +01:00
modmuss50
c0aab7f37a
Update crafttweaker support 2017-06-28 20:50:00 +01:00
modmuss50
c89aaaed7a
Initial removal of core mod 2017-06-28 15:20:18 +01:00
modmuss50
a37f724fa7
Some more work on getting mixins injected into the jar 2017-06-28 13:31:56 +01:00
modmuss50
ea81e66c87
Update ic2 dep 2017-06-28 09:02:48 +01:00
modmuss50
f2c753cf1d
Update to new forge, #releaseBuild 2017-06-26 09:40:58 +01:00
modmuss50
a774b2bcb2
Update to support forge model changes, #releaseBuild 2017-06-25 13:56:39 +01:00
modmuss50
3a83b81100
Bump version, #releaseBuild 2017-06-24 20:28:35 +01:00
modmuss50
ba644982fe
Update to support new forge registry system 2017-06-24 20:15:49 +01:00
modmuss50
2ae312581f
Bump version, #releaseBuild 2017-06-23 11:23:44 +01:00
modmuss50
138de281f4
Fixes issue with cable crafting, #betaBuild 2017-06-22 20:27:05 +01:00
modmuss50
df047a9ee7
Bump version, #betaBuild 2017-06-22 13:00:54 +01:00
modmuss50
82aa0e730f
Update forge and mappings to latest 2017-06-21 09:07:36 +01:00
modmuss50
0509066e74
Bump version, #betaBuild 2017-06-20 22:07:02 +01:00
modmuss50
3071d19db0
Initial work on Auto crafting table. 2017-06-20 18:54:45 +01:00
modmuss50
2c9e08bd63
Update forge and move off gradle RC 2017-06-19 11:16:00 +01:00
modmuss50
7eaef93136
Fix server start-up crash, #betaBuild 2017-06-18 14:14:42 +01:00
modmuss50
84cb99290d
#betaBuild 2017-06-17 17:49:03 +01:00
modmuss50
a9874131e9
Fix build for now 2017-06-17 17:42:33 +01:00
modmuss50
24faea17ba
Fixes issue in recipes + update forge 2017-06-15 12:07:03 +01:00
modmuss50
f1c5a0ad8d
Large bunch of recipe work, still shapedOreRecipes need fixing. 2017-06-14 22:50:20 +01:00
modmuss50
708ccc758a
Mappings update 2017-06-13 22:07:49 +01:00
modmuss50
29cf9fa90b
1.12 2017-06-11 21:22:07 +01:00
modmuss50
358b3a48a7
Bump version, #releaseBuild 2017-06-02 20:39:06 +01:00
modmuss50
450765a0cf
Bump version, #releaseBuild 2017-06-02 16:25:38 +01:00
modmuss50
6eae3e637e
Hide cable in JEI + update JEI compat 2017-06-02 16:24:40 +01:00
modmuss50
a6d0e57d10
Add expensive quarry recipe back in. 2017-06-02 15:44:00 +01:00
modmuss50
672b3ac6f1
Add basic cable textures, needs some work 2017-05-27 01:02:50 +01:00
Modmuss50
fe775a10eb Contains quick fix for cable issues, #betaBuild 2017-05-25 23:03:27 +01:00
modmuss50
50d1db2695
Major powernet changes, #betaBuild 2017-05-18 20:51:36 +01:00
modmuss50
daf7a90a28
Bump version, #releaseBuild 2017-04-21 09:16:58 +01:00
modmuss50
3d55b435d4
Ic2 1.11.2 support 2017-04-21 09:09:28 +01:00
ProfessorProspector
db3c7f0585 Bump version to 2.2 2017-04-14 12:35:09 -07:00
modmuss50
7013a7021d
Sign jars 2017-04-13 10:11:10 +01:00
modmuss50
cda60c7b8f
Update mappings to fix crash with FMP 2017-04-11 12:58:35 +01:00
modmuss50
39cc0f9452
Add FMP to gradle in prep for the cable rewrite. 2017-04-11 12:16:16 +01:00
modmuss50
569fd9665b Fix curse tools task always running 2017-04-11 00:21:30 +01:00
modmuss50
8c3be8366a fix deprecated warning in gradle. 2017-04-10 23:39:09 +01:00
modmuss50
9f11c9cc85
Bump version, #releaseBuild 2017-04-08 16:03:52 +01:00
modmuss50
8132620dcf
bump version, #releaseBuild 2017-03-14 13:30:20 +00:00
modmuss50
f1d878dc64
Fix incorrect URL for crafttweaker lib 2017-03-14 13:18:23 +00:00
modmuss50
7d10d64a43
Use 1.11 version :/ 2017-03-14 13:16:50 +00:00
modmuss50
aeedc67070
Use Ivy to get Crafttweaker 2017-03-14 13:16:31 +00:00
modmuss50
da6925195b
Update CraftTweaker support 2017-03-14 12:59:17 +00:00
modmuss50
e248cb5dc2
Merge 1.10.2 changes, #releaseBuild 2017-03-13 11:07:48 +00:00
modmuss50
26c208e811
Added license info to the header of all files. 2017-02-23 12:29:43 +00:00
modmuss50
835e42befd
Bump version, #releaseBuild 2017-02-16 08:27:44 +00:00
modmuss50
3854f98535
bump version, #releaseBuild 2017-02-13 10:34:36 +00:00
Modmuss50
a1c438e752 Update build.gradle 2017-02-07 20:26:33 +00:00
modmuss50
d01b7d559d
Fix transitive dependencies on reborn core 2017-01-31 19:26:12 +00:00
modmuss50
be96f971e8
BumpVersion #releaseBuild 2017-01-31 13:37:18 +00:00
modmuss50
1886c123ac
Bump version, #releaseBuild 2017-01-18 17:13:34 +00:00
Modmuss50
09d4a98c97 Attempt to speed up gradle build. 2017-01-15 15:14:05 +00:00
Ourten
2f10c5704c Bump version, #releaseBuild 2017-01-15 15:56:40 +01:00
modmuss50
99002697ee
Bump version + reborncore #releaseBuild 2016-12-27 20:08:28 +00:00
modmuss50
b2d070c7f3
Fix compile errors, and bump forge to 1.11.2 2016-12-27 19:47:54 +00:00
modmuss50
3131556ec8
Bump version, #releaseBuild 2016-12-20 14:09:13 +00:00
modmuss50
ce64156a9c
Bump version, #releaseBuild 2016-12-17 15:10:17 +00:00
modmuss50
c12d5aaf1e Bump version, #releaseBuild 2016-12-14 21:43:07 +00:00
modmuss50
ccdb5c0761 Fix merge issues, fix build 2016-12-14 09:28:05 +00:00
modmuss50
c1d2e875bf Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/blocks/BlockRubberLog.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/items/tools/ItemElectricTreetap.java
#	src/main/java/techreborn/items/tools/ItemTreeTap.java
2016-12-14 09:23:24 +00:00
Thomas Guillemard
ebf569a906 Make treetap working with the IC2 rubber tree (Fix #786) (#831)
Changes:
- The dependency of IC2 have been updated to the last version
- This implementation follow the original treetap logic but use
Techreborn original electrical cost.
2016-12-13 16:24:38 +00:00
modmuss50
601194685b Merge 1.10 changes, bump version for #releaseBuild 2016-12-13 11:53:33 +00:00
modmuss50
40852ca113 Bump version, #releaseBuild 2016-12-13 11:48:21 +00:00
ProfessorProspector
7bd8cf8562 #betaBuild 2016-12-10 22:02:06 -08:00
ProfessorProspector
ab1628de58 Bump version for hotfix 2016-12-10 15:01:19 -08:00
ProfessorProspector
bd83c55754 Bump version #releaseBuild 2016-12-10 14:30:37 -08:00
modmuss50
3f8128d890 Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 #betabuild
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
#	src/main/java/techreborn/items/tools/ItemWrench.java
2016-12-07 13:52:48 +00:00
modmuss50
7426f4e3ed bump version for #releasebuild 2016-12-07 13:49:44 +00:00
modmuss50
4a19f4ac6b Bump version #releasebuild 2016-12-06 20:50:25 +00:00
modmuss50
bf60b32eb2 Version 2.0.0 #betaBuild 2016-12-05 13:13:42 +00:00
modmuss50
5782d2d032 Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts:
#	src/main/java/techreborn/client/container/ContainerAlloySmelter.java
#	src/main/java/techreborn/client/container/ContainerAssemblingMachine.java
#	src/main/java/techreborn/client/container/ContainerCentrifuge.java
#	src/main/java/techreborn/items/tools/ItemNanosaber.java
2016-12-05 10:57:55 +00:00
modmuss50
40835a2773 Update forge version 2016-12-05 09:19:16 +00:00
modmuss50
0547999e0d
Bump version #releasebuild 2016-11-27 18:38:03 +00:00
ProfessorProspector
c53ab29cf1 Update TESLA 2016-11-26 17:15:59 -08:00
ProfessorProspector
018c761638 Update WAILA 1.9 to HWYLA 1.11 2016-11-26 14:34:54 -08:00
modmuss50
21833839e6
Bump version #releasebuild 2016-11-26 19:17:08 +00:00
modmuss50
6bf0a3b4bb
Add curse tools 2016-11-26 19:05:10 +00:00
modmuss50
a0e6a2dc34
Start on the update 2016-11-19 12:50:08 +00:00
modmuss50
59bd497893
Fix issue with ore generation in some cases 2016-11-07 22:39:53 +00:00
modmuss50
e0118c4cf3
Version 1.4.10
Disabled flares they can come later
2016-11-06 20:26:58 +00:00
modmuss50
9e47eb8cfe
Auto set formatter for idea 2016-11-05 16:30:22 +00:00
modmuss50
c9ff3330ca
Fix #794, fix some issues with ic2 wrench, and use new forge perms to check when taping and wrenching blocks 2016-11-05 15:10:28 +00:00
modmuss50
015620094c
1.4.9 2016-11-05 10:47:48 +00:00
modmuss50
603c12590d
Update to support RC 2.8 2016-11-04 20:03:05 +00:00
Modmuss50
0ece0aff33 Version Bump 2016-10-09 14:02:09 +01:00
modmuss50
fdb506ad15
Remove some config settings that break things, fixes #732 2016-10-08 21:56:24 +01:00
modmuss50
38f965917f Fix Start-up crash + new version 2016-09-27 19:34:18 +01:00
modmuss50
0aaa00fd03 Version 1.4.5 2016-09-27 18:31:56 +01:00
Modmuss50
9310ffadc8 Bump JEI version to see whats broken 2016-09-27 16:03:30 +01:00
modmuss50
281537a417 Added rubber to ore dic 2016-09-18 20:56:29 +01:00
modmuss50
d73c9d335f Update build.gradle 2016-09-18 13:04:31 +01:00
modmuss50
edf266588f Fix wrench recipe issues
Remove fluid pipe
Add recipe to switch rubber
Fix some missing textures
2016-09-16 22:56:21 +01:00
modmuss50
0a2e878b88 Fix #738 2016-09-07 08:21:42 +01:00
modmuss50
7aace619df Bump Version 2016-09-06 22:30:24 +01:00
modmuss50
d5ff2a42bb Fixes #723 and wrench works with ic2 machines now 2016-09-06 22:16:21 +01:00
Modmuss50
91945c8dc9 Only 1.10.2 now 2016-08-08 16:31:55 +01:00
modmuss50
cb44c79256 Remove needed block, update forge 2016-08-01 09:37:55 +01:00
Modmuss50
77134b5d7a Bump version for release 2016-07-25 08:19:34 -07:00
Modmuss50
6213060079 Update build.gradle 2016-07-25 08:15:05 -07:00
Archengius
320f30f8d9 Updated RebornCore version 2016-07-25 19:06:52 +07:00