ProfessorProspector
|
e5736669ca
|
Refactoring & cleaning
|
2018-09-16 13:48:51 -07: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
|
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
|
f54353290b
|
Updated ru_ru lang. Should fix FTBTeam/FTB-Continuum#437
|
2018-08-28 14:32:59 +03:00 |
|
drcrazy
|
db4dbdc956
|
UU-matter is now part of parts enum
|
2018-08-27 15:48:41 +03: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
|
f5c6b59ebd
|
Mappings
|
2018-07-20 22:31:20 +01:00 |
|
drcrazy
|
b3590dbb37
|
Make it run but tons of useless copy-paste
|
2018-07-20 02:56:19 +03:00 |
|
drcrazy
|
ff9ceecc28
|
Removed unused imports )
|
2018-06-25 14:55:23 +03:00 |
|
modmuss50
|
d4a43d24a1
|
Fix incorrect usage of item stack checking
I have no idea how they worked without issue for this long :D
|
2018-06-25 12:34:13 +01:00 |
|
modmuss50
|
475eb4b55f
|
Revert "Fixed warning in stack tooltip event."
This reverts commit 1614f71
|
2018-06-09 17:03:07 +01:00 |
|
drcrazy
|
1614f71244
|
Fixed warning in stack tooltip event.
|
2018-05-25 17:51:52 +03:00 |
|
modmuss50
|
02c708cd21
|
Final changes to the item power storage
|
2018-05-23 14:49:14 +01:00 |
|
drcrazy
|
c4c5f2135c
|
Started work in switching powered items to capability
|
2018-05-23 00:27:33 +03:00 |
|
modmuss50
|
f7008d9c87
|
Fix Issues with fake players breaking wood logs, fixes #1436
|
2018-02-13 17:44:46 +00:00 |
|
modmuss50
|
9c7f1995a8
|
Update year in license
|
2018-02-11 14:08:13 +00:00 |
|
modmuss50
|
510697c021
|
Fix #1378
|
2017-12-25 00:25:11 +00:00 |
|
drcrazy
|
05884b2fda
|
Fix issue with chainsaw cutting speed. Closes #1376
|
2017-12-23 00:28:53 +03:00 |
|
drcrazy
|
6c7f9078ec
|
Secondary gem moved to eventHandler. Closes #1365
|
2017-12-15 16:43:48 +03:00 |
|
drcrazy
|
9d1e64b1b2
|
Fixed texture error for fluid itemblocks.
|
2017-11-13 02:14:44 +03:00 |
|
modmuss50
|
e5e05d0afd
|
Chainsaw chops down the entire tree
|
2017-10-03 17:39:33 +01:00 |
|
drcrazy
|
ab1802ba5e
|
Refactoring for translation
|
2017-09-08 02:03:35 +03:00 |
|
modmuss50
|
2f221ed8c8
|
Fix #992
|
2017-07-10 18:49:04 +01:00 |
|
modmuss50
|
774fec221e
|
Auto format code
|
2017-06-28 20:54:12 +01:00 |
|
modmuss50
|
ba644982fe
|
Update to support new forge registry system
|
2017-06-24 20:15:49 +01:00 |
|
modmuss50
|
a701094d1d
|
Update all license headers
|
2017-06-15 12:28:26 +01:00 |
|
modmuss50
|
aa615f86bd
|
Recipes are now added to the recipe book when a tree tap is used.
|
2017-06-15 11:35:08 +01:00 |
|
modmuss50
|
5536a6cd94
|
Recipes can now show in the recipe book
|
2017-06-15 11:01:33 +01:00 |
|
modmuss50
|
b7e141e004
|
More config changes
|
2017-06-12 20:33:30 +01:00 |
|
Prospector
|
2b7868c651
|
More configs & start fixing cable models
|
2017-06-08 19:12:58 -07:00 |
|
modmuss50
|
aee7ca9f14
|
Rewrite cable logic to use FE.
Fixes #1077 Fixes #1071 Fixes #1067 Fixes #1070 Fixes #1059 Fixes #1044 Fixes #1041 Fixes #1025 Fixes #1006 Fixes #990 Fixes #987 Fixes #962 Fixes #955 Fixes #897
|
2017-05-18 16:01:18 +01:00 |
|
modmuss50
|
056eff09b2
|
Some more improvements to the power net.
|
2017-03-16 13:22:17 +00:00 |
|
modmuss50
|
26c208e811
|
Added license info to the header of all files.
|
2017-02-23 12:29:43 +00:00 |
|
modmuss50
|
b8949ee8fa
|
Add power net to profiling data.
|
2017-01-09 12:55:08 +00:00 |
|
Prospector
|
6a70424252
|
Continue the "Great refactor of 2017". Massive variable name refactoring and start splitting crafting table recipes to their own class.
|
2016-12-31 23:29:32 -08:00 |
|
ProfessorProspector
|
3162422ee2
|
remove more debug code
|
2016-12-21 17:12:24 -08:00 |
|
ProfessorProspector
|
2ecf8400b8
|
Fix red garnet drops
|
2016-12-21 17:03:34 -08:00 |
|
Prospector
|
811d9edf54
|
Fix #836
|
2016-12-14 11:25:50 -08:00 |
|
ProfessorProspector
|
86b98cab13
|
Unify tooltip messages, fix cable subtypes, and fix ruby drops
|
2016-12-10 18:13:27 -08:00 |
|
modmuss50
|
5dff31d937
|
A bunch more null check \o/
|
2016-12-06 18:22:18 +00:00 |
|
modmuss50
|
e16c3eba02
|
Auto format
|
2016-11-25 13:25:51 +00:00 |
|
modmuss50
|
a0e6a2dc34
|
Start on the update
|
2016-11-19 12:50:08 +00:00 |
|
ProfessorProspector
|
2de0ba95a6
|
Add ruby ore dropping garnets based on ore dict, not the ore itself. Closes #595
# Conflicts:
# src/main/java/techreborn/Core.java
|
2016-11-05 16:27:17 +00:00 |
|
modmuss50
|
871edce960
|
Fix some CME's in the powernet, and add a basic profiler to it, might add a command or someway to use this without enabling it in the code
|
2016-10-08 20:47:04 +01:00 |
|
modmuss50
|
796df6c055
|
Auto Format code
|
2016-10-08 20:46:16 +01:00 |
|
modmuss50
|
d96149fc97
|
Revert "Power system re-write, recipe fixes."
This reverts commit d982cc4028 .
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
|
2016-08-10 00:51:44 +01:00 |
|
Dragon2488
|
d982cc4028
|
Power system re-write, recipe fixes.
Please note that this version breaks all wires placed in worlds before.
|
2016-07-18 11:57:52 +07:00 |
|