Commit graph

1068 commits

Author SHA1 Message Date
modmuss50
a0ee459d13 Make empty cells require a glass pane due to thermal expansion changing their gear recipes to clash. Config to disable + add old recipe to rolling machine 2018-10-07 21:31:35 +01:00
modmuss50
66e60655bf Work towards https://github.com/TechReborn/TechReborn/issues/1614 still need to move all the other recipes that need it to use the ore dict 2018-10-07 21:20:18 +01:00
drcrazy
4612ab334c Cleanup of model registration 2018-10-04 12:38:34 +03:00
drcrazy
4ea5d2a818 Fix model registration. Moved items reg to event. 2018-10-03 17:34:03 +03:00
drcrazy
e9c2857db8 Initial work on event based registration 2018-09-26 18:28:59 +03:00
modmuss50
6713cd6296 Initial removal of itemblocks, wrench now drops the item with the nbt of the tile.
This is still WIP but mostly seems to work
2018-09-25 17:51:25 +01:00
drcrazy
d06bd5eef9 Improvements for debug tool and solar panel 2018-09-25 16:00:44 +03:00
drcrazy
f600432f05 All machines are now in enum. 2018-09-25 13:39:41 +03:00
drcrazy
25f06384f4 Energy storage enum-ed 2018-09-25 03:09:56 +03:00
drcrazy
f2d8891bd5 Fix build 2018-09-25 02:47:46 +03:00
drcrazy
f7ecfd0574 Item\Fluid storages went to enum. 2018-09-25 02:41:30 +03:00
drcrazy
809c02934a Moved generators to enum 2018-09-24 16:49:44 +03:00
drcrazy
86a2612b97 Moved some machines to enum 2018-09-24 16:13:35 +03:00
drcrazy
dd94ff31c9 Blocks moved to TRContent 2018-09-24 15:45:48 +03:00
drcrazy
9f9595f955 Moved items into content 2018-09-24 14:28:58 +03:00
drcrazy
bf7f7ba871 Renamed ModBlocks to TRBlocks 2018-09-23 23:21:19 +03:00
drcrazy
f02b24f813 Fixed cables rendering 2018-09-22 16:50:33 +03:00
drcrazy
7a005f7494 Sorting and renaming for cables and panels. Still not rendering 2018-09-21 19:44:30 +03:00
modmuss50
e068ca018c flatten cables, they dont render correctly in world yet 2018-09-20 19:49:25 +01:00
drcrazy
a5a0d03591 Solar panels flattened. 2018-09-20 16:42:32 +03:00
drcrazy
b7a0854cae MOre work on solar panels. Blockstate json isn't ready yet. 2018-09-19 18:24:35 +03:00
drcrazy
4245decc3c Some work on solar panels flattening 2018-09-18 15:32:13 +03:00
ProfessorProspector
b4ca82a97b Move machine casings over and temp gen localization 2018-09-17 17:07:11 -07:00
drcrazy
be23d2af6e Cleanup after refactoring 2018-09-17 13:16:49 +03:00
modmuss50
f6d5d88a4b rename TileLegacyMachineBase to TileMachineBase 2018-09-17 07:31:41 +01:00
ProfessorProspector
0b963dcda9 Continue to make sense of things... this mod's a mess lol 2018-09-16 20:31:01 -07:00
ProfessorProspector
c568876caa Revert ore dict comment & remove useless stuff 2018-09-16 14:01:00 -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
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
b05c2e948f Reorganized items json registration 2018-09-07 16:27:19 +03: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
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
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
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
drcrazy
3190185a54 Cleaned fluid translation keys. 2018-09-01 02:46:25 +03:00
drcrazy
cdaefe5886 Changed translation keys for block and items 2018-08-31 14:51:03 +03: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