TheDoctorSoda
|
fe216fba03
|
Merge pull request #1 from TechReborn/1.8.9
Pull stuff
|
2016-02-20 10:42:44 -08:00 |
|
modmuss50
|
0ac86ff303
|
Added sapling
|
2016-02-20 18:40:35 +00:00 |
|
TheDoctorSoda
|
d3c3f3edcf
|
Might've fixed tiling issue w/ rubber
|
2016-02-20 10:39:32 -08:00 |
|
Modmuss50
|
7edbabd419
|
Merge pull request #341 from TheDoctorSoda/1.8.9
Rubber sapling
|
2016-02-20 18:31:17 +00:00 |
|
TheDoctorSoda
|
44a60d984a
|
Rubber sapling
|
2016-02-20 10:29:03 -08:00 |
|
Modmuss50
|
6278a72d59
|
Merge pull request #340 from TheDoctorSoda/1.8.9
Changed rubber textures
|
2016-02-20 18:08:09 +00:00 |
|
TheDoctorSoda
|
765475bee7
|
Changed rubber textures
|
2016-02-20 09:58:03 -08:00 |
|
modmuss50
|
457178842c
|
Revert "Move IC2 api"
This reverts commit ac43b5afc4.
|
2016-02-20 17:06:46 +00:00 |
|
modmuss50
|
ac43b5afc4
|
Move IC2 api
|
2016-02-20 17:02:28 +00:00 |
|
modmuss50
|
71c2bfee7f
|
Moved power system to RC and spawn trees in groups
|
2016-02-20 16:59:31 +00:00 |
|
modmuss50
|
891d2cce32
|
Added rubber processing
|
2016-02-20 10:58:58 +00:00 |
|
gigabit101
|
defde302fe
|
Added machine block recipe last commit for night
|
2016-02-20 03:57:15 +00:00 |
|
gigabit101
|
ee2841b5b1
|
Added machine blocks
|
2016-02-20 03:47:35 +00:00 |
|
gigabit101
|
f947ef37a4
|
Added basic battery and fixed issues with Lithium Battery
|
2016-02-20 03:35:20 +00:00 |
|
gigabit101
|
047625389d
|
Added compressor, extractor, electric furnace
|
2016-02-20 03:07:56 +00:00 |
|
gigabit101
|
cd13932bde
|
Basic generator just needs logic
|
2016-02-20 02:21:44 +00:00 |
|
modmuss50
|
cfab240ac7
|
Added some more items
|
2016-02-20 01:32:08 +00:00 |
|
gigabit101
|
4521008c73
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-02-20 01:08:22 +00:00 |
|
gigabit101
|
464d8cac03
|
Added advancedCircuit and Circuit
|
2016-02-20 01:08:18 +00:00 |
|
modmuss50
|
575150edf3
|
Fix jei log spam
|
2016-02-20 01:03:37 +00:00 |
|
modmuss50
|
eaf82b68e8
|
Fix tree rarity
|
2016-02-20 00:58:04 +00:00 |
|
gigabit101
|
aa41d576e3
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-02-20 00:58:02 +00:00 |
|
gigabit101
|
8ad4a45716
|
Added basic Grinder
|
2016-02-20 00:57:57 +00:00 |
|
modmuss50
|
a76384504f
|
Rubber Trees
|
2016-02-20 00:55:18 +00:00 |
|
gigabit101
|
f8ca41a9ce
|
Closes #294
|
2016-02-19 23:33:18 +00:00 |
|
modmuss50
|
6636fc648b
|
Initial work on rubber trees
|
2016-02-19 20:58:23 +00:00 |
|
modmuss50
|
c9fad62ed2
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-02-19 20:32:35 +00:00 |
|
modmuss50
|
9268fa4d55
|
1117 lines of new recipes?
Added a new recipe manager to allow us to list the missing items that need to be reimplemented.
|
2016-02-19 20:32:26 +00:00 |
|
mezz
|
a1ef232b38
|
Update JEI, minor clean up of JEI integration
|
2016-02-17 23:44:15 -08:00 |
|
modmuss50
|
fb1d6f1074
|
Version 0.7.11
|
2016-02-16 22:05:43 +00:00 |
|
modmuss50
|
9a585bcfb2
|
Merge branch '1.7.10' into 1.8.9
Conflicts:
build.gradle
src/main/java/techreborn/blocks/BlockOre.java
src/main/java/techreborn/items/ItemCells.java
|
2016-02-16 13:49:25 +00:00 |
|
modmuss50
|
25777b3f96
|
Fixes #217
|
2016-02-16 10:00:03 +00:00 |
|
modmuss50
|
c0ebf03f72
|
fixes #326
|
2016-02-16 09:20:26 +00:00 |
|
modmuss50
|
840f524350
|
Quick fix for #329
|
2016-02-16 09:11:13 +00:00 |
|
The-Fireplace
|
efccf62690
|
Update BlockOre.java
Conflicts:
src/main/java/techreborn/blocks/BlockOre.java
|
2016-02-16 09:08:07 +00:00 |
|
modmuss50
|
bf691fd8a6
|
Fixes #313
|
2016-02-16 09:07:22 +00:00 |
|
Modmuss50
|
ca693fbc8e
|
Version 0.7.10
|
2016-02-13 09:10:56 +00:00 |
|
Modmuss50
|
484fec1680
|
Update build.gradle
|
2016-02-13 09:06:18 +00:00 |
|
modmuss50
|
99d69f3cbb
|
Update to new RF API, closes #335
|
2016-02-10 13:15:02 +00:00 |
|
modmuss50
|
80327d3689
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-02-09 17:44:02 +00:00 |
|
modmuss50
|
284e5d1d51
|
Add mc version to jar name
|
2016-02-09 17:43:46 +00:00 |
|
Modmuss50
|
910353d58d
|
Merge pull request #334 from The-Fireplace/1.8.9
Ores can only be harvested with Iron Tier tools and up. Closes #333
|
2016-02-06 20:20:46 +00:00 |
|
The-Fireplace
|
0d35ecb70f
|
Update BlockOre.java
|
2016-02-06 14:18:47 -06:00 |
|
modmuss50
|
b3bec47b11
|
Fixes #313
|
2016-02-06 11:51:55 +00:00 |
|
modmuss50
|
99756b355f
|
Fixes #328
|
2016-02-06 11:48:37 +00:00 |
|
modmuss50
|
4585684fe2
|
Removed bucket textures as it now generates them at runtime
|
2016-02-02 21:22:51 +00:00 |
|
modmuss50
|
8ec95f9119
|
Now using new Forge Dynamic buckets, and prep for new update
|
2016-02-02 21:05:42 +00:00 |
|
modmuss50
|
e509d42e36
|
Fix building on machines with < 5GB of RAM
|
2016-02-02 08:31:19 +00:00 |
|
mezz
|
e4af69e861
|
Update JEI & Forge, add recipe click areas and rolling machine transfer
|
2016-02-01 17:59:23 -08:00 |
|
modmuss50
|
39f74149af
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-02-01 15:06:29 +00:00 |
|
