Commit graph

2652 commits

Author SHA1 Message Date
modmuss50
26c208e811
Added license info to the header of all files. 2017-02-23 12:29:43 +00:00
modmuss50
5d60e10806
Remove some unneeded files. 2017-02-23 12:24:06 +00:00
mezz
5c13230c42 Stop worldgen chunk generation runaway from rubber trees 2017-02-16 18:22:42 -08:00
modmuss50
385f28a5b7
Bump version, #releaseBuild 2017-02-16 08:33:17 +00:00
modmuss50
b4a2138cb9
Merge branch '1.11.2' of https://github.com/TechReborn/TechReborn into 1.11.2 2017-02-16 08:27:57 +00:00
modmuss50
835e42befd
Bump version, #releaseBuild 2017-02-16 08:27:44 +00:00
mezz
6e98c7e0bc Stop minor worldgen chunk generation runaway from iridium 2017-02-15 20:52:41 -08:00
modmuss50
3854f98535
bump version, #releaseBuild 2017-02-13 10:34:36 +00:00
modmuss50
2a543b4170
Fixes crash with player detectors, closes #973
(cherry picked from commit 58ff71b)
2017-02-13 10:30:44 +00:00
Modmuss50
a1c438e752 Update build.gradle 2017-02-07 20:26:33 +00:00
Prospector
c0b68918e6 Merge pull request #966 from al132/patch-3
Fix Nether Ore Gen above nether ceiling
2017-02-04 19:29:24 -08: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
Modmuss50
55f63aabc4 Merge pull request #957 from VanDerGroot/1.11.2
Added grinder recipe for endstone.
2017-02-02 08:12:52 +00: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
d01b7d559d
Fix transitive dependencies on reborn core 2017-01-31 19:26:12 +00:00
modmuss50
be96f971e8
BumpVersion #releaseBuild 2017-01-31 13:37:18 +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
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