drcrazy
|
c7db26c21e
|
Legacy code removed
|
2018-11-06 12:56:16 +03:00 |
|
drcrazy
|
430f534b3a
|
Updated JEI compat to use VanillaTypes once again.
|
2018-11-05 13:03:00 +03:00 |
|
drcrazy
|
7ab571bcc7
|
More marble dust required to make calcite dust. Closes #1629
|
2018-11-05 12:39:22 +03:00 |
|
drcrazy
|
df13aeeba2
|
Should fix electric furnace progress + formatting. Closes #1621
|
2018-10-29 17:40:16 +03:00 |
|
drcrazy
|
50e35578a2
|
Matter fabricator got progress arrow back. Closes #1617
|
2018-10-23 17:54:12 +03:00 |
|
drcrazy
|
26e09d1687
|
WaterMill and neutron reflectors deduplicated. Closes #1620
|
2018-10-23 17:26:39 +03:00 |
|
drcrazy
|
066c6ba3e0
|
INitial work on #1620
|
2018-10-23 13:44:06 +03:00 |
|
drcrazy
|
bdd961e0a7
|
Rubber wood block will give more slabs and stairs. Closes #1619
|
2018-10-19 16:10:23 +03:00 |
|
Prospector
|
0cbefc63d2
|
Rename 1 thing
|
2018-10-17 18:21:57 -07:00 |
|
modmuss50
|
7fe876fe73
|
Fix #1614
|
2018-10-07 21:53:46 +01:00 |
|
modmuss50
|
20b1874e2c
|
Fix #1602
|
2018-10-07 21:36:39 +01:00 |
|
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
|
ec0724b15f
|
Refactoring for model registration
|
2018-10-03 18:26:47 +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
|
1e9cfa07b6
|
Removed excessive setCreativeTab from blocks
|
2018-09-25 13:56:59 +03:00 |
|
drcrazy
|
f600432f05
|
All machines are now in enum.
|
2018-09-25 13:39:41 +03:00 |
|
drcrazy
|
20a385f6ca
|
Fix block break
|
2018-09-25 03:42:12 +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 |
|
modmuss50
|
5377941e10
|
Fixes issues with ores, closes https://github.com/FTBTeam/FTB-Continuum/issues/461
|
2018-09-19 16:46:32 +01:00 |
|
drcrazy
|
b7a0854cae
|
MOre work on solar panels. Blockstate json isn't ready yet.
|
2018-09-19 18:24:35 +03:00 |
|
drcrazy
|
10e91deeff
|
Iron machines got their names back. Closes #1606
|
2018-09-19 13:06:41 +03:00 |
|
drcrazy
|
4245decc3c
|
Some work on solar panels flattening
|
2018-09-18 15:32:13 +03:00 |
|
drcrazy
|
0918bceb23
|
Call getHeatFromState in a static way.
|
2018-09-18 12:45:29 +03:00 |
|
ProfessorProspector
|
b4ca82a97b
|
Move machine casings over and temp gen localization
|
2018-09-17 17:07:11 -07:00 |
|
drcrazy
|
0c54a4538e
|
More cleanup after refactoring
|
2018-09-17 16:42:17 +03:00 |
|
drcrazy
|
bdf53c9094
|
Add block info into debug tool output
|
2018-09-17 15:55:09 +03:00 |
|
drcrazy
|
89ca71386f
|
re-Structured assets for items a little bit
|
2018-09-17 14:32:55 +03:00 |
|
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
|
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
|
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
|
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 |
|
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 |
|
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 |
|