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 |
|
modmuss50
|
c2562ac7b3
|
Update JSONDestroyer
|
2016-02-01 15:06:14 +00:00 |
|
Modmuss50
|
e04a4a540f
|
Prep for update for new reborn core
|
2016-01-24 11:37:43 +00:00 |
|
Modmuss50
|
e154c15fd9
|
Prep for update for new reborn core
|
2016-01-24 11:37:19 +00:00 |
|
modmuss50
|
3909a868aa
|
Revert "Revert "Fix bucket issues""
This reverts commit d5b880387a.
# Conflicts:
# src/main/java/techreborn/items/tools/ItemFluidbucket.java
|
2016-01-22 17:41:47 +00:00 |
|
modmuss50
|
f7ccd07b1a
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
# Conflicts:
# src/main/java/techreborn/items/tools/ItemFluidbucket.java
|
2016-01-22 13:40:47 +00:00 |
|
modmuss50
|
7e7ad74203
|
Squashed commit of the following:
commit 00d9c08c78680aba0310febfce5f42ccdb873eb6
Author: modmuss50 <modmuss50@gmail.com>
Date: Fri Jan 22 13:38:27 2016 +0000
Rename to fix spelling issue
commit cf780e5f6dc548b64da8e4e2f24f38377b692c5c
Author: modmuss50 <modmuss50@gmail.com>
Date: Fri Jan 22 13:27:15 2016 +0000
Update to new JSON-Destoryer version
commit ef3c8636242a54787d53cef9dda373818030d991
Author: modmuss50 <modmuss50@gmail.com>
Date: Wed Jan 20 17:27:41 2016 +0000
Update to new json destroyer
|
2016-01-22 13:39:20 +00:00 |
|
modmuss50
|
d5b880387a
|
Revert "Fix bucket issues"
This reverts commit 43768b9310.
|
2016-01-16 17:50:18 +00:00 |
|
modmuss50
|
43768b9310
|
Fix bucket issues
|
2016-01-16 15:54:41 +00:00 |
|
Modmuss50
|
5304e38502
|
Update README.md
|
2016-01-16 13:27:11 +00:00 |
|
modmuss50
|
006b611fa3
|
Fix another merge error
|
2016-01-16 13:16:55 +00:00 |
|
modmuss50
|
415531587b
|
Fix incorrect merge
|
2016-01-16 13:11:08 +00:00 |
|
modmuss50
|
2a617919d9
|
Merge remote-tracking branch 'remotes/origin/1.7.10' into 1.8.9
# Conflicts:
# src/main/java/techreborn/compat/fmp/ForgeMultipartCompat.java
# src/main/java/techreborn/tiles/TileBlastFurnace.java
|
2016-01-16 13:09:09 +00:00 |
|
modmuss50
|
b7023f3114
|
Merge remote-tracking branch 'remotes/origin/master' into 1.7.10
|
2016-01-16 13:06:43 +00:00 |
|
gigabit101
|
77bfbc46f8
|
closes #311
|
2016-01-16 04:32:58 +00:00 |
|
