Commit graph

2622 commits

Author SHA1 Message Date
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
Modmuss50
75859d14fb Update README.md 2017-01-24 20:58:34 +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
1886c123ac
Bump version, #releaseBuild 2017-01-18 17:13:34 +00: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
Modmuss50
09d4a98c97 Attempt to speed up gradle build. 2017-01-15 15:14:05 +00:00
Ourten
2f10c5704c Bump version, #releaseBuild 2017-01-15 15:56:40 +01:00
ProfessorProspector
38525a5bb0 Multiblock work, and industrial grinder gui 2017-01-14 11:06:34 -08:00
modmuss50
5cd7298e70
Bump version, #releaseBuild 2017-01-14 16:58:52 +00: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