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 |
|
TheDoctorSoda
|
44a60d984a
|
Rubber sapling
|
2016-02-20 10:29:03 -08:00 |
|
TheDoctorSoda
|
765475bee7
|
Changed rubber textures
|
2016-02-20 09:58:03 -08: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 |
|
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 |
|
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
|
c0ebf03f72
|
fixes #326
|
2016-02-16 09:20:26 +00:00 |
|
modmuss50
|
4585684fe2
|
Removed bucket textures as it now generates them at runtime
|
2016-02-02 21:22:51 +00:00 |
|
mezz
|
4b804c3521
|
Add alloy furnace recipes
|
2015-12-30 21:17:20 -08:00 |
|
mezz
|
181498e132
|
Clean up JEI Integration
|
2015-12-30 20:09:06 -08:00 |
|
modmuss50
|
0d4b9afd01
|
All Items now have textures
|
2015-11-27 20:17:12 +00:00 |
|
Modmuss50
|
285176e171
|
Large handfull of textures.
|
2015-11-26 21:48:30 +00:00 |
|
Modmuss50
|
2c31b9211c
|
Started work on the player detector.
|
2015-11-18 20:59:08 +00:00 |
|
Modmuss50
|
08cbe33f00
|
Fixes #263
|
2015-11-18 20:14:46 +00:00 |
|
Mazdallier
|
6efa1de164
|
Update fr_FR.lang
all done
|
2015-11-17 10:22:27 +01:00 |
|
Modmuss50
|
f42c127201
|
Added basic fustion reactor multiblock checking.
|
2015-11-16 15:20:19 +00:00 |
|
Mazdallier
|
81b45789ac
|
Update fr_FR.lang
big update to continuous line 695
|
2015-11-16 15:40:43 +01:00 |
|
Modmuss50
|
100293fb8e
|
Started work on reactor.
|
2015-11-16 13:36:44 +00:00 |
|
Modmuss50
|
9b1378a64c
|
Fixes #269
|
2015-11-15 21:12:31 +00:00 |
|
Modmuss50
|
df5bd1422a
|
Fixes #267
|
2015-11-15 20:54:31 +00:00 |
|
gigabit101
|
421597fbab
|
Added missing localizations closes #242
|
2015-11-13 16:48:51 +00:00 |
|
gigabit101
|
0ebf0c95dd
|
more charge slots
|
2015-11-13 16:29:35 +00:00 |
|
Modmuss50
|
08a3636e72
|
Fixes #260
|
2015-11-12 21:00:03 +00:00 |
|
Modmuss50
|
5419067213
|
Work for #242
|
2015-11-12 08:32:14 +00:00 |
|
Modmuss50
|
842fa421ae
|
Fixes #243
|
2015-11-11 17:00:18 +00:00 |
|
Modmuss50
|
47a466ef21
|
Some fixes for #242
|
2015-11-11 15:24:13 +00:00 |
|
Modmuss50
|
701c658323
|
Fixes all of #242
|
2015-11-11 13:17:14 +00:00 |
|
MrBretzel
|
1307406e10
|
Adding iron alloy smelter to not enough items and fix ChargedHud possible crash
|
2015-11-01 23:10:32 +01:00 |
|
gigabit101
|
57b85450e6
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-11-01 16:55:02 +00:00 |
|
gigabit101
|
206d09ed31
|
Added a bunch more localization
|
2015-11-01 16:54:58 +00:00 |
|
modmuss50
|
bffbd31cab
|
Sort of Revert "why was this done twice"
This reverts commit 363adeb681 .
Fixes #209
|
2015-11-01 16:24:35 +00:00 |
|
MrBretzel
|
28b0a5da8c
|
Move to png
Fix bug
|
2015-10-25 08:14:08 +01:00 |
|
MrBretzel
|
67398ca163
|
Move to jpeg
just a bug...
|
2015-10-25 08:13:38 +01:00 |
|
modmuss50
|
81c498086a
|
closes #176
|
2015-10-10 16:51:56 +01:00 |
|
gigabit101
|
a8ea0f55e7
|
Removed a load of un needed junk from other versions of Gtech
|
2015-10-09 21:55:54 +01:00 |
|
gigabit101
|
5a230b20a2
|
Fix's #185
|
2015-10-09 21:10:20 +01:00 |
|
Modmuss50
|
caca45d86b
|
Removed Iron Gear Texture
|
2015-10-07 16:09:14 +01:00 |
|
Modmuss50
|
75e2bd4733
|
Machines now explode when they come in contact with rain.
|
2015-10-07 15:41:26 +01:00 |
|
modmuss50
|
c30633b5d3
|
Added config for disabling connected textures
|
2015-10-02 21:09:57 +01:00 |
|
modmuss50
|
219570f288
|
Added connected textures to reinforced casing
|
2015-09-26 16:21:50 +01:00 |
|
modmuss50
|
f889b9a051
|
Some crappy textures, adds all connected textures
|
2015-09-26 15:54:25 +01:00 |
|