modmuss50
1f0fa709bc
Bump version
2019-12-17 02:00:12 +00:00
modmuss50
801693cedc
#releaseBuild
2019-12-16 20:14:39 +00:00
modmuss50
86fdbae7b2
Cleanup maven pom, hopefully I havent broken anything.
2019-12-16 18:56:19 +00:00
drcrazy
9b496c0a1a
Update fabric-api, rei, towelette
2019-12-16 18:34:18 +03:00
modmuss50
0d5f37c6b7
#releaseBuild
2019-12-15 19:46:36 +00:00
modmuss50
e171d0eabc
Remove duplicate annotations.
2019-12-13 10:00:59 +00:00
modmuss50
dd2125158d
fix config issues
2019-12-13 09:50:21 +00:00
modmuss50
2fe94ddbf0
Update gradle versions
2019-12-11 15:30:52 +00:00
modmuss50
baa96d8877
Updates
2019-12-11 14:28:39 +00:00
modmuss50
b1f3cbf1c6
#betaBuild
2019-12-10 07:34:39 +00:00
Meredith Espinosa
649d28d63c
update to new libcd! ( #1902 )
2019-12-10 07:31:32 +00:00
modmuss50
b74d46101b
Fix #1875
2019-12-08 22:40:29 +00:00
modmuss50
84e6246890
#betaBuild
2019-12-04 17:58:26 +00:00
modmuss50
e48d1f1184
Pre 4 mappings
2019-12-04 16:49:53 +00:00
modmuss50
eebdf9a4b5
#betaBuild
2019-11-26 20:49:05 +00:00
modmuss50
bfdde04892
1.15-pre2 loads of new mappings
2019-11-26 19:03:36 +00:00
modmuss50
937b184ace
Update fabric
2019-11-22 21:41:13 +00:00
modmuss50
6cb919b9a2
Fix rubber trees #betaBuild
2019-11-22 21:05:40 +00:00
modmuss50
d6935ff09d
#betaBuild
2019-11-21 22:16:15 +00:00
modmuss50
bc57e38828
Merge remote-tracking branch 'origin/1.15' into 1.15
2019-11-21 21:51:38 +00:00
modmuss50
c8ce611841
1.15-pre1
2019-11-21 21:51:30 +00:00
shedaniel
16fe02f359
FIx REI Compat for 1.15 snapshots ( #1888 )
2019-11-15 17:17:06 +00:00
modmuss50
977ac8f8a8
merge fixes
2019-11-14 19:09:32 +00:00
modmuss50
d5e89c5e20
Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/blocks/misc/BlockRubberLog.java
2019-11-14 19:03:36 +00:00
modmuss50
a984263b04
inital 19w46a port
2019-11-14 18:37:42 +00:00
shedaniel
8ecfa4207a
Some REI Compat Changes ( #1882 )
...
* Update REi
* Update to 3.2.6
2019-11-07 14:46:19 +00:00
drcrazy
7d17823b55
Bump dependencies
2019-11-01 16:47:23 +03:00
modmuss50
1b35ef88ee
#releaseBuild
2019-10-30 15:36:13 +00:00
modmuss50
99ad05f772
#releaseBuild
2019-10-28 21:13:25 +00:00
modmuss50
696fe65edd
#releaseBuild
2019-10-26 22:06:50 +01:00
modmuss50
14f09886f7
Update libs
2019-10-25 11:58:08 +01:00
modmuss50
79c17600b0
Tweak TR build script, remove some broken things
2019-10-18 19:42:15 +01:00
modmuss50
0cfcfc5f20
#releaseBuild
2019-10-12 19:21:58 +01:00
Meredith Espinosa
989e4601af
Add LibCD Support ( #1851 )
...
* First ugly commit for LibCD support
* fix all the ugly hacks, add rolling machine + fluid gen recipes
* be a bit more lenient with fluid generator names
* add test script, fix a few bugs
* get rid of ShapedRecipeSerializer stuff that's no longer needed
* Add a warning to the sample script
2019-10-11 21:30:26 +01:00
modmuss50
5f32f4dfda
#releaseBuild
2019-09-26 14:46:54 +01:00
modmuss50
b5650bfa2c
#betaBuild
2019-09-22 15:27:40 +01:00
modmuss50
b70a938796
Cables can now pull energy out of other mods blocks.
2019-09-22 14:17:46 +01:00
modmuss50
3fe62e2c77
19w38b
2019-09-21 13:01:38 +01:00
modmuss50
2d8961589d
Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/client/render/DynamicBucketBakedModel.java
# src/main/java/techreborn/client/render/DynamicCellBakedModel.java
2019-09-21 12:36:37 +01:00
modmuss50
0a7b501511
#betaBuild
2019-09-20 23:12:10 +01:00
modmuss50
d4d55922ca
quick fix for translations
2019-09-20 20:53:28 +01:00
drcrazy
989acffd4e
Bump REI version slightly
2019-09-18 15:45:15 +03:00
modmuss50
a4a578917d
Update energy api
2019-09-16 23:11:56 +01:00
modmuss50
7e05b0da12
Merge branch 'power' into 1.14.4
2019-09-15 19:15:39 +01:00
modmuss50
aa6eb60d46
Finish porting to new power api
2019-09-15 19:14:42 +01:00
modmuss50
e39e6e9070
#betaBuild
2019-09-15 15:56:55 +01:00
modmuss50
09f7fe2427
Possibly fix build? should be able to undo this after 1 build
2019-09-15 14:27:58 +01:00
modmuss50
2f9b154e22
Move to RC's fluid instance, closes #1826
2019-09-15 13:59:46 +01:00
modmuss50
fcfd387bc0
Semver + include RC Closes #1831
2019-09-15 13:43:04 +01:00
modmuss50
168dc30314
#alphaBuild
2019-09-12 17:00:21 +01:00
modmuss50
6e53132c59
Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
2019-09-12 16:55:52 +01:00
modmuss50
8c9c736da9
19w37a
2019-09-12 16:55:41 +01:00
modmuss50
cc51e9b016
#betaBuild
2019-09-10 14:24:26 +01:00
modmuss50
4f80a8c651
start on new power api
2019-09-10 14:09:15 +01:00
modmuss50
1cc56ed2e3
#alphaBuild
2019-08-28 00:20:08 +01:00
modmuss50
4a5fe76323
19w34a
2019-08-27 23:58:42 +01:00
modmuss50
2b28281d90
#betaBuild
2019-08-26 20:25:41 +01:00
modmuss50
b8def12639
#betaBuild
2019-08-21 19:51:55 +01:00
modmuss50
2c87620649
Clean up old maven repos, to try and fix build
2019-08-21 19:48:59 +01:00
modmuss50
05d95915e5
Dont jar in jar, it breaks some stuff
2019-08-19 20:41:30 +01:00
modmuss50
39ea95ec9e
#betaBuild
2019-08-19 20:39:53 +01:00
modmuss50
0d0d2b23d5
Include RC in the TR jar
2019-08-19 20:24:31 +01:00
Daniel She
f0b8d99853
Update to REI 3.0-pre ( #1793 )
...
* Update to REI 3.0-pre
* Update fabric.mod.json
2019-08-19 14:26:47 +01:00
modmuss50
d7d7eeb2ed
#betaBuild
2019-08-18 16:04:58 +01:00
modmuss50
047e4b7401
#betaBuild
2019-08-13 22:11:45 +01:00
modmuss50
bedae13e2a
#betaBuild
2019-08-13 16:30:44 +01:00
modmuss50
eca7aaa34f
add a Towelette plugin to blacklist our fluids, fixes the game not loading
2019-08-13 16:24:24 +01:00
drcrazy
54813ecdc3
Bumped modloader + recipes + lang for buckets
2019-08-13 13:51:44 +03:00
modmuss50
c17c49249a
#betaBuild
2019-08-12 23:47:10 +01:00
modmuss50
2a5708b328
Rolling machine port/fixes
2019-08-12 15:05:49 +01:00
modmuss50
a906fad739
#betaBuild
2019-08-09 00:26:47 +01:00
modmuss50
2edffead05
update to use fabric api's offical event
2019-08-08 23:35:27 +01:00
modmuss50
861e79a398
#betaBuild
2019-08-08 13:52:02 +01:00
modmuss50
a7d069d48c
Fix build
2019-08-08 13:47:59 +01:00
modmuss50
4c25ba221c
#betaBuild
2019-08-07 21:40:42 +01:00
modmuss50
c7a0bb6aec
#betaBuild
2019-08-07 20:29:00 +01:00
modmuss50
e4136f547d
Fix version not being set in the mod.json + some clean up
2019-08-06 23:42:25 +01:00
modmuss50
e1112a5cff
Fix build
2019-08-06 23:06:55 +01:00
modmuss50
0dc2636046
Final build fixes
2019-07-25 14:35:27 +01:00
modmuss50
7bf0e4f08a
Fix build?
2019-07-25 14:16:30 +01:00
modmuss50
52da17dfd5
Start on REI support, very basic right now, but it will help a lot when adding recipes.
2019-07-25 13:14:46 +01:00
modmuss50
9b46e3237e
move to silk fluids
2019-07-23 21:30:57 +01:00
modmuss50
50c13bafdc
1.14.4
2019-07-22 11:31:24 +01:00
modmuss50
e26d1edc52
Configs
2019-07-10 21:56:22 +01:00
modmuss50
18950e0b29
1.14.3 + more recipe fixes
2019-07-01 00:24:12 +01:00
modmuss50
f8f20ce6ba
1.14.2
2019-06-13 13:14:11 +01:00
modmuss50
4479116d1c
Add a tooltip event to fix the tooltips
2019-06-12 22:27:09 +01:00
modmuss50
e8396dbc33
831, doesnt seem impossible
2019-05-27 22:21:58 +01:00
modmuss50
4e03ac893c
1147 - Initial auto mappings pass
2019-05-26 12:37:59 +01:00
drcrazy
5c309c8b3d
Updated forge to 1.13.2 - 25.0.191. Removed unused imports
2019-04-26 17:37:10 +03:00
drcrazy
c122a480e5
Updated forge and mappings
2019-04-01 17:22:59 +03:00
modmuss50
f9efc72c99
Update forge
2019-03-05 14:28:42 +00:00
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
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
