drcrazy
|
be23d2af6e
|
Cleanup after refactoring
|
2018-09-17 13:16:49 +03:00 |
|
modmuss50
|
524770abba
|
Move around some classes that didnt need their own high level package
|
2018-09-17 07:34:13 +01:00 |
|
modmuss50
|
f6d5d88a4b
|
rename TileLegacyMachineBase to TileMachineBase
|
2018-09-17 07:31:41 +01:00 |
|
ProfessorProspector
|
714ddd075b
|
Update logo & mcmod.info
|
2018-09-16 20:41:42 -07:00 |
|
ProfessorProspector
|
0b963dcda9
|
Continue to make sense of things... this mod's a mess lol
|
2018-09-16 20:31:01 -07:00 |
|
ProfessorProspector
|
d98802ee1b
|
Add example tags based on Lex's example
|
2018-09-16 18:56:03 -07:00 |
|
ProfessorProspector
|
c568876caa
|
Revert ore dict comment & remove useless stuff
|
2018-09-16 14:01:00 -07:00 |
|
ProfessorProspector
|
269e297d9e
|
3
|
2018-09-16 13:52:02 -07:00 |
|
ProfessorProspector
|
e5736669ca
|
Refactoring & cleaning
|
2018-09-16 13:48:51 -07:00 |
|
ProfessorProspector
|
874559c21e
|
Try to make things make more sense
|
2018-09-15 19:36:37 -07:00 |
|
drcrazy
|
f6c143dce3
|
Flattened casings
|
2018-09-16 03:34:26 +03:00 |
|
drcrazy
|
1d4116a215
|
Flattened frames
|
2018-09-14 17:16:59 +03:00 |
|
modmuss50
|
94b1e19abf
|
Merge remote-tracking branch 'remotes/origin/master' into 1.13-prep
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
|
2018-09-13 20:16:23 +01:00 |
|
modmuss50
|
5307fd4528
|
Fix fluid config showing when it shouldn't
|
2018-09-13 20:01:35 +01:00 |
|
modmuss50
|
01a3663b11
|
more changes to the inventory stuff
|
2018-09-13 19:56:32 +01:00 |
|
modmuss50
|
01644e4f65
|
Fix slot config, some changes to the way Inventory works as well to allow for this.
|
2018-09-13 19:33:14 +01:00 |
|
drcrazy
|
305f74b107
|
Storage blocks flattened
|
2018-09-12 16:56:24 +03:00 |
|
drcrazy
|
7393a8bdd6
|
Ores flattened
|
2018-09-12 16:15:05 +03:00 |
|
drcrazy
|
916c8c5ba4
|
Initial work on ores flattening
|
2018-09-10 16:45:04 +03:00 |
|
drcrazy
|
35669641ba
|
Changed translation names for ingredients
|
2018-09-10 13:42:22 +03:00 |
|
drcrazy
|
1b3bf6f5c2
|
Cleaned up translation keys
|
2018-09-07 17:37:49 +03:00 |
|
drcrazy
|
b05c2e948f
|
Reorganized items json registration
|
2018-09-07 16:27:19 +03:00 |
|
Modmuss50
|
3444c05c40
|
IInventory > IItemHandler
Most things should work, but havent been tested
Slot config will not work just yet
|
2018-09-07 14:05:19 +01:00 |
|
drcrazy
|
645606c5c4
|
itemRubber already oredicted in proper class
|
2018-09-07 15:25:10 +03:00 |
|
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 |
|
