Commit graph

2337 commits

Author SHA1 Message Date
drcrazy
291eadfeed More work for Sawmill 2017-04-07 18:22:37 +03:00
drcrazy
8b4ce46e46 Initial commit for Insdustrial Sawmill JEI support 2017-04-07 02:53:09 +03:00
ProfessorProspector
94341db24a Fix axes I broke 2017-03-30 18:56:15 -07:00
ProfessorProspector
dc638cea9c Axes extend ItemAxe Fixes #1027 2017-03-30 18:02:58 -07:00
modmuss50
10bbdbc4d7
Fixes thermal generator crash, closes #972
(cherry picked from commit bb582fd)
2017-03-16 15:54:48 +00:00
modmuss50
056eff09b2
Some more improvements to the power net. 2017-03-16 13:22:17 +00:00
modmuss50
332fe1be48
Fixes crash when gem tools are disabled, closes #1008 2017-03-15 10:08:58 +00:00
modmuss50
5231e1d93b
Fix Industrial Grinder getting stuck at 100%, closes #1004 2017-03-15 09:59:23 +00:00
modmuss50
5ed6760db9
Machines no longer explode when they receive too much power, they just smoke. Fix a crash with the power net.
(cherry picked from commit 2ae5951)
2017-03-15 09:48:33 +00:00
modmuss50
50093455ab
Experimental changes to try and fix some issues with the power net.
(cherry picked from commit ad940a7)
2017-03-15 09:48:29 +00:00
modmuss50
92acc51aaf
Added a creative panel, it provides infinite power and has no recipe.
(cherry picked from commit 456ee3c)
2017-03-15 09:48:25 +00:00
modmuss50
da6925195b
Update CraftTweaker support 2017-03-14 12:59:17 +00:00
modmuss50
a960f1820a
Fix incorrect height when generating ores. Closes #1007
(cherry picked from commit d50f91d)
2017-03-14 12:42:03 +00:00
modmuss50
8b80cb7562
De-Dupe Frequency Transmitter
(cherry picked from commit 127df1f)
2017-03-13 11:04:25 +00:00
modmuss50
35e104d901
Fixes issue with small dust recipes, closes #1005
(cherry picked from commit 80a387b)
2017-03-13 11:04:17 +00:00
modmuss50
fe9d1defdc
Fix null issue with last cherry pick 2017-03-13 11:04:10 +00:00
modmuss50
bbf93c3ae3
Rewrite some of the logic behind the matter fabricator, now works with ic2 scrap as well.
Closes #1002 and Closes #822

(cherry picked from commit 93ccd8b)
2017-03-13 11:03:44 +00:00
modmuss50
76332ee946
Fixes some recipes not using the ore dict correctly.
(cherry picked from commit 3ee81c2)
2017-03-13 11:02:56 +00:00
modmuss50
1656b4b4a0
Remove WIP tag from charge bench as it works
(cherry picked from commit 3025d5c)
2017-03-13 11:01:53 +00:00
modmuss50
82c9d00f97
Added recipe for endstone dust, closes #989
(cherry picked from commit 96d8220)
2017-03-13 11:01:41 +00:00
modmuss50
d126edaa1b
Fixes #981 2017-02-23 12:38:36 +00:00
modmuss50
26c208e811
Added license info to the header of all files. 2017-02-23 12:29:43 +00:00
mezz
5c13230c42 Stop worldgen chunk generation runaway from rubber trees 2017-02-16 18:22:42 -08:00
mezz
6e98c7e0bc Stop minor worldgen chunk generation runaway from iridium 2017-02-15 20:52:41 -08:00
modmuss50
2a543b4170
Fixes crash with player detectors, closes #973
(cherry picked from commit 58ff71b)
2017-02-13 10:30:44 +00:00
al132
d1fe85c4f3 Fix Nether Ore Gen above nether ceiling
Same as 1.10.2 PR
2017-02-04 21:28:36 -06:00
Ourten
57d1c60750 Fix JackHammer crash when mining blocks 2017-02-04 13:47:26 +01:00
Ourten
9847719a91 Fix automation for IndustrialGrinder and IndustrialElectrolyzer, closes #953 2017-02-03 16:57:34 +01:00
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