Commit graph

2359 commits

Author SHA1 Message Date
Ourten
e0300d3a05 Fix nanosaber log spam 2017-02-03 14:18:15 +01:00
Ourten
08087871a1 Fix wrench drop of LightningRod, SolarPanel, WaterMill and WindMill 2017-02-02 22:28:48 +01:00
Ourten
eafc5c831d Fix Grinder not displaying energy info 2017-02-02 22:23:00 +01:00
Jim Groth
3bee9245f8 Added grinder recipe for endstone. 2017-02-02 03:51:58 +01:00
modmuss50
5978b31dfc
Fix for iridium not spawning in stone. 2017-02-01 17:35:29 +00:00
modmuss50
4ac134ef26
New textures for iridium to make it standout a bit more. Thanks @VanDerGroot 2017-02-01 17:27:41 +00:00
modmuss50
2b546b1991
Fix issues with getting item stacks, Closes #940 and fixes a bunch of other stuff 2017-02-01 17:10:29 +00:00
modmuss50
927b99df02
Add Iridium plate recipe to ic2 compressor.
(cherry picked from commit 2f5817c)
2017-01-31 13:33:35 +00:00
modmuss50
f392cd4290
Fix issues with getting item stacks, Closes #940 and fixes a bunch of other stuff 2017-01-31 12:33:00 +00:00
modmuss50
45600ded32
Merge remote-tracking branch 'origin/1.11.2' into 1.11.2 2017-01-31 12:29:34 +00:00
modmuss50
12f23f6434
Add a recipe for clay dust into the grinder, closes #945 2017-01-31 12:29:18 +00:00
Ourten
1b084569ac Fix recycler outputSlot 2017-01-27 01:46:16 +01:00
modmuss50
77280fad79
Fix nukes. 2017-01-26 21:44:18 +00:00
modmuss50
c058e2fbee
Fix #932 2017-01-24 21:28:54 +00:00
modmuss50
38cad3b0f1
Should remove the last few issues with the power net, closes #924 and #930 2017-01-24 21:21:02 +00:00
modmuss50
f2a3e61603
Merge branch '1.11.2' of https://github.com/TechReborn/TechReborn into 1.11.2 2017-01-24 21:11:37 +00:00
modmuss50
ed771a6e05
Fix rolling machine power storage value being large, closes #934 2017-01-24 21:11:27 +00:00
Ourten
ae31e8a0dc Fix steel jackhammer config values, closes #927 2017-01-23 13:39:00 +01:00
Ourten
fea2ce5f1f Improve FluidGenerators performance with recipes check 2017-01-19 01:12:32 +01:00
modmuss50
fb83e98707
fixes #914 2017-01-18 15:18:43 +00:00
modmuss50
4e0878b182
Move this to the correct location 2017-01-18 11:23:52 +00:00
modmuss50
0872a802da
Update to support new item power. 2017-01-18 09:55:24 +00:00
modmuss50
2c53c16010
Fixes #877 2017-01-17 22:12:30 +00:00
modmuss50
e93c580528
Fix Minetweaker issue. 2017-01-16 10:06:11 +00:00
modmuss50
a172c6aabe
Add coal to the grinder. 2017-01-16 10:03:58 +00:00
modmuss50
9e02f1ff35
Add config to disable railcraft steel recipe. 2017-01-16 10:01:00 +00:00
Ourten
64020b01e0 Fix AlloyFurnace ItemStack null reference, closes #901 2017-01-15 23:45:48 +01:00
ProfessorProspector
38525a5bb0 Multiblock work, and industrial grinder gui 2017-01-14 11:06:34 -08:00
modmuss50
84c03dbe3f
Fix MT issue, closes #888 2017-01-14 16:56:41 +00:00
modmuss50
2a632ac265
Fix some recipe issues, closes #899 2017-01-14 16:53:49 +00:00
modmuss50
2c60034a88
Update to new RebornCore. Added a config setting to disable railcrafts Iron Nugget to Steel Nugget recipe. 2017-01-11 15:33:34 +00:00
modmuss50
5588bda10b
Update to support updated recipe format in reborn core.
(cherry picked from commit 6aa8fde64a)

# Conflicts:
#	src/main/java/techreborn/api/recipe/BaseRecipe.java
#	src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java
#	src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java
#	src/main/java/techreborn/compat/minetweaker/MTGeneric.java
#	src/main/java/techreborn/tiles/TileAlloyFurnace.java
2017-01-11 08:34:29 +00:00
modmuss50
8b24fdf765
Merge remote-tracking branch 'remotes/origin/feature/containers-builder' into 1.11.2
# Conflicts:
#	src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
#	src/main/java/techreborn/tiles/TileAlloyFurnace.java
2017-01-10 19:34:17 +00:00
modmuss50
0d22eb2c56
Fix jackhammer not breaking all rocks, closes #864 2017-01-10 19:28:12 +00:00
ProfessorProspector
af91263621 Chemical reactor GUI & a couple recipe fixes 2017-01-09 16:54:48 -08:00
ProfessorProspector
99be70713b Recycler gui 2017-01-09 15:57:29 -08:00
ProfessorProspector
06cb13b910 useless range upgrade 2017-01-09 07:18:19 -08:00
modmuss50
b8949ee8fa
Add power net to profiling data. 2017-01-09 12:55:08 +00:00
ProfessorProspector
dc160bbd67 started with one thing...then I ended up doing a lot of shit. 2017-01-08 23:03:36 -08:00
Ourten
4e6b60e8e7 Fix tier1 machines hopper integration 2017-01-09 00:49:57 +01:00
Ourten
ac322f3e65 Fix recycler, Closes #887 2017-01-09 00:27:53 +01:00
Ourten
25e683b2e9 Fix some tiles update on clientside 2017-01-08 23:49:56 +01:00
ProfessorProspector
0c4895efa4 Electric Furnace gui! 2017-01-08 14:46:13 -08:00
ProfessorProspector
8b56947c28 Charge bench GUI 2017-01-08 14:27:45 -08:00
ProfessorProspector
eea9b83a9c Generator gui! 2017-01-08 14:07:34 -08:00
modmuss50
2ec7340383
Added better checks to ore dict, Closes #894 2017-01-08 21:58:32 +00:00
modmuss50
6aa8fde64a
Update to support updated recipe format in reborn core. 2017-01-08 21:43:15 +00:00
Ourten
cd33860403 Remove comment 2017-01-08 22:34:04 +01:00
Ourten
a700d80e0f Fix icon of SpriteSlot 2017-01-08 22:33:50 +01:00
ProfessorProspector
2a78196939 Revamp centrifuge jei support 2017-01-08 12:29:14 -08:00
Ourten
eb220643fc Change all containers init to IContainerProvider + Add Enum for gui ids handling 2017-01-08 20:34:46 +01:00
Ourten
b93fe6c5ad Convert FusionReactor 2017-01-08 16:32:03 +01:00
Ourten
bd16289c60 Convert IndustrialElectrolyzer, IndustrialGrinder and IndustrialSawmill 2017-01-08 16:20:13 +01:00
Ourten
b5881e2102 Convert VacuumFreezer and ImplosionCompressor 2017-01-08 16:01:24 +01:00
Ourten
ea98e4a8a0 Convert BlastFurnace 2017-01-08 15:45:05 +01:00
Ourten
665b5f7569 Convert MatterFabricator 2017-01-08 15:22:59 +01:00
Ourten
ad890079ec Convert RollingMachine 2017-01-08 14:00:19 +01:00
Ourten
8a0a133e02 Convert AlloyFurnace and AlloySmelter 2017-01-08 13:10:13 +01:00
Ourten
619ddb14b8 Convert Scrapboxinator 2017-01-08 12:28:16 +01:00
ProfessorProspector
3c40e25b6a Centrifuge stuff 2017-01-08 03:18:28 -08:00
ProfessorProspector
0a9a62c455 Only clear if id 0 2017-01-08 01:37:44 -08:00
ProfessorProspector
a785d2a514 Make things better 2017-01-08 01:27:18 -08:00
ProfessorProspector
32c86b535b Merge branch '1.11.2' of https://github.com/TechReborn/TechReborn into feature/containers-builder 2017-01-07 20:59:41 -08:00
ProfessorProspector
9cbe6008c4 Fix batbox player slot positions 2017-01-07 20:25:26 -08:00
ProfessorProspector
0cccb0a91b Merge branch 'feature/containers-builder' of https://github.com/TechReborn/TechReborn into feature/containers-builder
# Conflicts:
#	src/main/java/techreborn/client/gui/GuiBatbox.java
#	src/main/java/techreborn/client/gui/GuiQuantumChest.java
2017-01-07 20:22:34 -08:00
ProfessorProspector
d385e6eaf4 Batbox gui overhaul 2017-01-07 20:09:46 -08:00
Ourten
b9444b5ce5 Convert recycler + Fix slot indexes 2017-01-08 02:41:50 +01:00
Ourten
d77ed99e8a Convert AssemblingMachine 2017-01-08 02:31:37 +01:00
Ourten
35329cdc4a Convert ChemicalReactor 2017-01-08 02:23:03 +01:00
Ourten
60c88884a7 Convert Centrifuge 2017-01-08 02:19:26 +01:00
Ourten
94a0616d8e Add JEI transfer support for ContainerBuilder + Convert Compressor, Extractor and Grinder 2017-01-08 02:04:02 +01:00
Ourten
1df2c84e16 Convert ElectricFurnace 2017-01-07 22:11:54 +01:00
Ourten
af524f169f Convert IronFurnace 2017-01-07 21:56:23 +01:00
Ourten
0325383d21 Convert Fluid Generators 2017-01-07 21:06:08 +01:00
Ourten
f771b7a78d Convert Generator + Add fuelSlot 2017-01-07 20:34:03 +01:00
Ourten
53a3869092 Convert MFSU and BatBox 2017-01-07 19:12:50 +01:00
Ourten
e7eaa40bde Add convenient energy sync method to builder + Convert MFE + Fix slots range again 2017-01-07 17:21:14 +01:00
Ourten
28c4932ef6 Fix shift slots range 2017-01-07 16:16:00 +01:00
Ourten
89d3e8538b Cleanup some ContainerBuilder code 2017-01-07 15:59:59 +01:00
ProfessorProspector
49ae0045aa Fix a few recipes 2017-01-07 00:29:19 -08:00
ProfessorProspector
61688e1d62 Actually call mixed metal ingot recipes #releaseBuild Fixes #890 2017-01-07 00:05:08 -08:00
ProfessorProspector
0f172ddf52 some things 2017-01-07 00:02:57 -08:00
Ourten
9f74feabff Add container syncing helper + Rename slot builder methods
An example of the new syncing system can be found in the ChargeBench
2017-01-07 02:46:46 +01:00
Ourten
b688fe72e4 Fix shift-click deleting pre-existing stack 2017-01-06 22:57:40 +01:00
Ourten
728e956d69 Fix merge-shifting bypass of slot filters 2017-01-06 22:39:06 +01:00
ProfessorProspector
6acded92ed The return of Mr. Gui Builder 2017-01-05 21:01:28 -08:00
Ourten
19cdb5b4eb Fix shift-click bypass of slot filters + Remade ChargeBench and ChunkLoader with ContainerBuilder 2017-01-06 02:30:51 +01:00
Ourten
b70d9b41c6 Begin the ContainerBuilder system
Right now it doesn't do much and the internal code is quite ugly.
2017-01-06 00:43:34 +01:00
modmuss50
c3fe135498
Fixes issues with red garnets dropping, Closes #871 2017-01-05 21:26:31 +00:00
modmuss50
039cab23eb
Fixes some final issues with ic2 de-duplication, closes #875 2017-01-05 21:22:33 +00:00
ProfessorProspector
56b8b346f0 The Great Refactor of 2017 - make things more abstract 2017-01-05 13:16:51 -08:00
ProfessorProspector
e86c0d175c The Great Refactor of 2017 - More recipes moved over! 2017-01-05 13:14:24 -08:00
modmuss50
a0c3cc644a
Add MissingIngredientExpection 2017-01-05 21:11:44 +00:00
Ourten
11c67f68a9 Fix TechReborn chests inventory capabilities. close #878 2017-01-05 00:17:53 +01:00
ProfessorProspector
2ad33bd6a9 The Great Refactor of 2017 - Remove old Plate Cutting Machine stuff, move UU matter and cable recipes over, fix industrial grinder eu usage, clean up EnumStandaloneCableType, move Fluid Generator, Rolling Machine, Scrapbox, and Smelting recipes over. Add some alternative rolling recipes for metal recipes that are more efficient. 2017-01-04 14:19:41 -08:00
Prospector
1215c47fc2 The Great Refactor of 2017 - Extractor Recipes 2017-01-03 09:32:55 -08:00
modmuss50
eb2453480f
Remove this other event handler, and move it to RC 2017-01-03 15:13:36 +00:00
modmuss50
ab301d25db
Move multiblock event registry to reborn core 2017-01-03 15:04:30 +00:00
Prospector
bd4103b7df The Great Refactor of 2017 - Industrial Centrifuge Recipes 2017-01-03 00:33:25 -08:00
Prospector
1831ff4dbc The Great Refactor of 2017 - Implosion Compressor Recipes 2017-01-02 18:00:14 -08:00
modmuss50
345a319d98
WIP changes for updates MineTweaker 2017-01-02 23:41:46 +00:00
Prospector
cf6fbb5ddc Remove debug lines and make tools children of item/handheld. 2017-01-02 15:31:28 -08:00
Prospector
f88f0f3cdb Fix cell outputs and lang 2017-01-02 15:14:09 -08:00
Prospector
c4b003f946 Localize Compressed Air and Electrolyzed Water 2017-01-02 13:24:53 -08:00
Prospector
a29006cae2 Electrolyzed Water recipe 2017-01-02 13:20:57 -08:00
Prospector
8bd1660c41 Remove duplicate recipe and fix bonemeal recipe in electrolyzer 2017-01-02 13:18:37 -08:00
Prospector
206b20ac9e The Great Refactor of 2017: Electrolyzer Edition 2017-01-02 13:08:58 -08:00
Prospector
007c6ca38a Add a use for bauxite and continue the great refactor of 2017 2017-01-01 19:32:53 -08: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
c24116e259 Redo all Industrial Grinder recipes, and move them to a separate class (Here starts the great recipe cleanup of 2017!) 2016-12-30 23:45:42 -08:00
ProfessorProspector
9b73f20ad0 Fix lazurite plate recipe. not ready for a new build yet 2016-12-30 14:49:31 -08:00
modmuss50
b2d070c7f3
Fix compile errors, and bump forge to 1.11.2 2016-12-27 19:47:54 +00:00
modmuss50
0922e0b886
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/init/IC2Dict.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/init/OreDict.java
2016-12-26 23:49:42 +00:00
ProfessorProspector
415660c988 Tweak how nugget recipes are done once again, and \o/ 2500th commit! 2016-12-22 15:12:13 -08:00
ProfessorProspector
2e9bf11569 Fix nuggets -> ingot recipes 2016-12-22 14:40:24 -08:00
ProfessorProspector
68d5a49d75 Add iridium reinforced stone & tungstensteel block recipes 2016-12-22 14:39:10 -08:00
ProfessorProspector
a446c76397 Add nuggets -> ingot and ingot -> nuggets recipes 2016-12-22 14:33:21 -08:00
al132
8306ebc72c Fix display slots in Fusion Reactor JEI 2016-12-22 11:29:07 -06:00
ProfessorProspector
3162422ee2 remove more debug code 2016-12-21 17:12:24 -08:00
ProfessorProspector
73f362bf76 Actually fix gems ore dict 2016-12-21 17:08:13 -08:00
ProfessorProspector
2ecf8400b8 Fix red garnet drops 2016-12-21 17:03:34 -08:00
ProfessorProspector
bdde7859f9 Fix any other potential bugs with the gems or any other forgotten items from the great rename of December 2016. This day shall be known as the day that I have prevented more bugs from the 8 or so bug reports I have caused from a single line of code changed about a week ago. It was a shame that it had gotten so far, but this should make sure that it does not happen again. All ingots/gems/plates/dusts/nuggets/smalldusts now convert any camelCase input to snake_case before handling it. This is probably the longest commit message I have ever written. Closes #860 2016-12-21 16:47:53 -08:00
ProfessorProspector
948d4de3ad Fix block ore dictionary names 2016-12-21 16:41:33 -08:00
ProfessorProspector
1759199601 Remove debug code 2016-12-21 16:22:34 -08:00
ProfessorProspector
011f164bd7 Fix gem ore dictionary entries 2016-12-21 16:20:34 -08:00
ProfessorProspector
78a3d1f589 Revert ore dictionary commit which said it fixed it but actually broke it :P #releaseBuild 2016-12-21 15:59:27 -08:00
modmuss50
7a6b3b6b48
Added a config to allow the de-duplication of ic2 items. When this is enabled TR will require you to use ic2's recipes. #releaseBuild 2016-12-21 17:57:36 +00:00
modmuss50
936ee13686
Remove last duplicated items. 2016-12-21 17:44:44 +00:00
modmuss50
5ff09a7eda
Some more work on deduplicating ic2 items/blocks 2016-12-21 17:31:52 +00:00
modmuss50
10ef977fd9
Fix ore dic names, closes #853 2016-12-20 14:08:15 +00:00
modmuss50
3e6fc0647f
Fix crash with certain mods, closes #854 2016-12-20 14:02:21 +00:00
modmuss50
ca98d7d8b8
Fixes Breaking Ruby ore, closes #856 and #855 2016-12-20 14:00:58 +00:00
modmuss50
bfcc3a2117
Initial work on IC2 de-duplication 2016-12-18 21:36:29 +00:00
Ourten
c8b3568a0c Unify TechReborn chests + Fix deep chests inventory drops 2016-12-18 22:06:07 +01:00
Ourten
da41ae7731 Apply QuantumChest fixes to DigitalChest 2016-12-18 21:34:01 +01:00
Ourten
baebc948d9 Add JEI integration for fluid generators recipes 2016-12-18 04:02:51 +01:00
Ourten
1d27182cc2 Fix FluidGenerators activation and energy production 2016-12-17 17:18:49 +01:00
Ourten
003d124667 Allow FluidGenerators to refill items with their tank 2016-12-17 16:22:31 +01:00
modmuss50
75c82353fa
Fix #843, Some fluids dont have a texture so they wont render. 2016-12-17 15:07:03 +00:00
modmuss50
cb69f10c88
Fix Watermill missing texture, closes #841 2016-12-17 14:54:32 +00:00
Ourten
97192ee3f4 Add the unified FluidGenerator recipe system + Restructure FluidGenerators tiles
They should all be pretty now
2016-12-17 01:25:32 +01:00
Ourten
3bf346f39a Fix QuantumChest duplication bug and content sync 2016-12-16 21:44:32 +01:00
Ourten
f65999f960 Fix QuantumTank fluid updates 2016-12-16 15:11:46 +01:00
Ourten
1181ce49f2 Add tryAddingEnergy to ThermalGenerator to fix eternal activation with adjacent lava 2016-12-15 14:41:04 +01:00
Ourten
d727c2698b Add tryAddingEnergy method to SemifluidGenerator 2016-12-15 14:39:53 +01:00
Ourten
487fdeddcb Add activation state change for HeatGenerator + Cleanup side-check code 2016-12-15 14:39:27 +01:00
Ourten
a0e068cad4 Add tryAddingEnergy method to GasTurbine
This method will avoid blocking of the generator a little bit before it's max capacity
2016-12-15 14:36:48 +01:00
Ourten
8f0cc22472 Add activation state change to DragonEggSiphoner + Add convenient energy add method 2016-12-15 14:35:37 +01:00
Modmuss50
b67e08e267 Merge pull request #837 from Ourten/fix/energy-generators
Energy generators fix
2016-12-14 21:12:15 +00:00
Prospector
811d9edf54 Fix #836 2016-12-14 11:25:50 -08:00