drcrazy
|
6d3d1f2df2
|
Organized items. MOved creative tab setter to parent.
|
2018-09-07 14:51:41 +03:00 |
|
drcrazy
|
c56da8cf18
|
Use static fuse in static way. cherry-pick from: 8cac9a9315
|
2018-09-07 12:21:34 +01:00 |
|
drcrazy
|
8cac9a9315
|
Use static fuse in static way.
|
2018-09-07 13:31:38 +03:00 |
|
Modmuss50
|
67226de701
|
fix compile changes
|
2018-09-05 18:43:33 +01: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 |
|
drcrazy
|
6d4616b38e
|
Updated constructor parameter name
|
2018-09-04 17:37:32 +03:00 |
|
drcrazy
|
b41783054e
|
Fixed translation keys and update TR discord link
|
2018-09-04 17:25:45 +03:00 |
|
drcrazy
|
79ff8ee5b0
|
Cleaned up code dupes
|
2018-09-04 13:46:51 +03:00 |
|
drcrazy
|
a05ba25f31
|
Flattened upgrades
|
2018-09-04 13:26:09 +03:00 |
|
drcrazy
|
a40635e75f
|
Renamed ModItems to TRItems. Sorted members inside it.
|
2018-09-03 17:46:21 +03:00 |
|
drcrazy
|
0443ad4a3a
|
Destructopack is a separate item
|
2018-09-03 17:01:46 +03:00 |
|
drcrazy
|
33b9f697dc
|
Merged all ingredients into single class
|
2018-09-03 14:49:59 +03:00 |
|
drcrazy
|
0b1733b733
|
DUsts and dustsSmall are combined into single class
|
2018-09-03 14:00:06 +03:00 |
|
drcrazy
|
f01d75404c
|
Buffed oreCoal processing in Industrial Grinder
|
2018-09-02 23:45:02 +03:00 |
|
Modmuss50
|
253abcad48
|
#releaseBuild
|
2018-09-02 14:15:57 +01:00 |
|
Modmuss50
|
9a19223c84
|
Revert "Updated JEI compat to use VanillaTypes"
This reverts commit c41b889
Done becuase VanillaTypes are not in a stable build of JEI
|
2018-09-02 14:02:08 +01:00 |
|
Modmuss50
|
852c4584a4
|
Fix language issues
|
2018-09-02 13:57:41 +01:00 |
|
Modmuss50
|
c527bb1976
|
#releaseBuild
|
2018-09-01 23:49:19 +01:00 |
|
Modmuss50
|
7ed304329a
|
Log more when building #releaseBuild
|
2018-09-01 23:46:05 +01:00 |
|
Modmuss50
|
96c36e272f
|
#releaseBuild
|
2018-09-01 23:32:26 +01:00 |
|
drcrazy
|
08cee81d54
|
Updated machine names in JEI.
|
2018-09-01 03:01:51 +03:00 |
|
drcrazy
|
3190185a54
|
Cleaned fluid translation keys.
|
2018-09-01 02:46:25 +03:00 |
|
Modmuss50
|
53ad3a7a60
|
Add configs to the nuke, closes #1594
|
2018-08-31 16:32:16 +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 |
|
drcrazy
|
edf0227598
|
CLeanup of blocks
|
2018-08-31 15:36:39 +03:00 |
|
Modmuss50
|
1b0ff5f95a
|
Fix small naming issue
|
2018-08-31 13:25:01 +01:00 |
|
Modmuss50
|
cc8c2c6e3b
|
Fix odd name for Auto Crafting Table
|
2018-08-31 13:19:55 +01:00 |
|
drcrazy
|
cdaefe5886
|
Changed translation keys for block and items
|
2018-08-31 14:51:03 +03:00 |
|
Modmuss50
|
9b0f583cab
|
Translations are now handled over at https://translate.techreborn.ovh/ using crowdin
|
2018-08-30 22:47:25 +01:00 |
|
drcrazy
|
2d3c074767
|
Fix for cells in CT scripts. Some work on #1590
|
2018-08-29 18:23:56 +03:00 |
|
drcrazy
|
c41b889160
|
Updated JEI compat to use VanillaTypes
|
2018-08-29 16:44:45 +03:00 |
|
drcrazy
|
f0852a09cf
|
Updated JEI createDrawable usage for fusion reactor.
|
2018-08-28 16:43:37 +03:00 |
|
drcrazy
|
f54353290b
|
Updated ru_ru lang. Should fix FTBTeam/FTB-Continuum#437
|
2018-08-28 14:32:59 +03:00 |
|
EnGinners
|
304046b457
|
Update ru_ru.lang (#1582)
This one has less changes compare to similar one from @AlekseiVoronin
|
2018-08-28 13:40:47 +03:00 |
|
drcrazy
|
e254f519c6
|
Removed excessive not null check
|
2018-08-28 11:21:15 +03:00 |
|
Modmuss50
|
c1be3fb765
|
Fixes https://github.com/FTBTeam/FTB-Continuum/issues/428
|
2018-08-27 18:23:16 +01:00 |
|
drcrazy
|
f44aa92093
|
Removed unused imports
|
2018-08-27 17:52:26 +03:00 |
|
drcrazy
|
db4dbdc956
|
UU-matter is now part of parts enum
|
2018-08-27 15:48:41 +03:00 |
|
drcrazy
|
8f7cc291bd
|
OreDict partially back, same for some recipes
|
2018-08-27 15:28:26 +03:00 |
|
drcrazy
|
8987311694
|
Flattened parts
|
2018-08-27 13:26:56 +03:00 |
|
Modmuss50
|
f251349189
|
Should fix #1587
|
2018-08-24 21:07:38 +01:00 |
|
Modmuss50
|
0ea442a993
|
Merge pull request #1588 from YuRaNnNzZZ/1.12-rockcutterfix
Fix for Rock Cutter getting an enchant on every re-craft
|
2018-08-24 18:16:56 +01:00 |
|
YuRaNnNzZZ
|
2e461b5ef6
|
rock cutter no longer gets enchanted on recraft
|
2018-08-24 20:12:50 +03:00 |
|
drcrazy
|
de45f3e68d
|
SmallDusts flattened
|
2018-08-24 15:56:53 +03:00 |
|
drcrazy
|
edd4e0df3e
|
Flattened dusts.
|
2018-08-24 14:56:25 +03:00 |
|
drcrazy
|
1ee9ffb007
|
Flattened ingots.
|
2018-08-24 13:43:03 +03:00 |
|
drcrazy
|
aadc7150f3
|
Gems are flattened
|
2018-08-23 17:16:17 +03:00 |
|
drcrazy
|
2939ee02a3
|
Flattened nuggets
|
2018-08-23 15:20:57 +03:00 |
|
drcrazy
|
45d6317d12
|
Changes plates registration
|
2018-08-23 14:05:22 +03:00 |
|
