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
|
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
|
524770abba
|
Move around some classes that didnt need their own high level package
|
2018-09-17 07:34:13 +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
|
e5736669ca
|
Refactoring & cleaning
|
2018-09-16 13:48:51 -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
|
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
|
33b9f697dc
|
Merged all ingredients into single class
|
2018-09-03 14:49:59 +03:00 |
|
Modmuss50
|
c1be3fb765
|
Fixes https://github.com/FTBTeam/FTB-Continuum/issues/428
|
2018-08-27 18:23:16 +01:00 |
|
drcrazy
|
8987311694
|
Flattened parts
|
2018-08-27 13:26:56 +03:00 |
|
drcrazy
|
edd4e0df3e
|
Flattened dusts.
|
2018-08-24 14:56:25 +03:00 |
|
drcrazy
|
aadc7150f3
|
Gems are flattened
|
2018-08-23 17:16:17 +03:00 |
|
Modmuss50
|
4e352c0953
|
Add creative versions of the Quantum tank and chest, they provide unlimited amount of the specified item/fluid
|
2018-08-12 16:32:43 +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
|
8139b865a9
|
Fix potential issues
|
2018-07-26 18:16:59 +01:00 |
|
drcrazy
|
eb2816df1d
|
Returned return.
|
2018-07-23 13:47:12 +03:00 |
|
drcrazy
|
b3002b6f57
|
Fixed warnings
|
2018-07-23 12:55:18 +03:00 |
|
modmuss50
|
f5c6b59ebd
|
Mappings
|
2018-07-20 22:31:20 +01:00 |
|
modmuss50
|
95b49e5e23
|
Move some stuff around in RC
|
2018-07-20 22:02:46 +01:00 |
|
drcrazy
|
7be239adca
|
Updated wrenching logic for energy storages and casings. Closes #1543
|
2018-06-15 18:18:32 +03:00 |
|
drcrazy
|
24bce3ce66
|
Updated wrenching for lamp and alarm
|
2018-06-15 17:26:43 +03:00 |
|
drcrazy
|
8d1c116df0
|
Updated wrench logic for cables.
|
2018-06-15 16:49:46 +03:00 |
|
ProfessorProspector
|
603e346c0f
|
New ore textures
|
2018-06-14 19:17:53 -07:00 |
|
ProfessorProspector
|
9ed05fb7ff
|
Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts:
# src/main/java/techreborn/blocks/BlockAlarm.java
|
2018-06-14 10:57:07 -07:00 |
|
ProfessorProspector
|
cfda5fd2a4
|
Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts:
# src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java
# src/main/java/techreborn/blocks/generator/BlockWaterMill.java
# src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
# src/main/java/techreborn/blocks/storage/BlockLSUStorage.java
# src/main/java/techreborn/blocks/transformers/BlockTransformer.java
|
2018-06-14 10:53:32 -07:00 |
|
drcrazy
|
c409b67c3c
|
Updated block wrenching
|
2018-06-14 18:32:41 +03:00 |
|
drcrazy
|
77e1c54b86
|
Fixed inventory drop for DSU. More work on #1543
|
2018-06-14 18:32:40 +03:00 |
|
drcrazy
|
42bc110cb2
|
Fixed build, but DSU blocks are not done yet.
|
2018-06-13 17:42:46 +03:00 |
|
drcrazy
|
e2225b06d4
|
Updated wrenching logic. Some work for #1543
|
2018-06-13 15:28:31 +03:00 |
|
Prospector
|
6d3b415ddd
|
Unify creative tabs
|
2018-06-12 15:42:20 -07:00 |
|
drcrazy
|
baacc67a64
|
Fixed unused and override warnings.
|
2018-06-12 12:55:57 +03:00 |
|
modmuss50
|
60c8527f6d
|
Rubber plank stairs and slab
|
2018-06-08 21:05:56 +01:00 |
|
drcrazy
|
93e324cc11
|
Fixed electric tree tap. Closes #1535
|
2018-06-08 15:46:28 +03:00 |
|
modmuss50
|
959e318859
|
Add energy storage to RebornCore's wrenableBlocks list
|
2018-05-26 20:38:47 +01:00 |
|
drcrazy
|
1ad23439eb
|
Cleaned up supressed warnings
|
2018-05-25 14:24:35 +03:00 |
|
modmuss50
|
c20e1c72a9
|
Fixes #1515
|
2018-05-17 11:00:35 +01:00 |
|