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 |
|
