Modmuss50
|
d5ce5cba04
|
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
# Conflicts:
# src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java
|
2015-12-12 11:41:21 +00:00 |
|
Modmuss50
|
cc6dfbc3c4
|
Fixes #295
|
2015-12-11 21:52:35 +00:00 |
|
Modmuss50
|
5c95b238fa
|
Fixes #296
|
2015-12-11 21:33:32 +00:00 |
|
Modmuss50
|
31f1786f6d
|
Updated JEI
|
2015-12-11 20:07:38 +00:00 |
|
Modmuss50
|
f4a8c3519a
|
Should fix build
|
2015-12-11 19:54:58 +00:00 |
|
Modmuss50
|
9bb3aad137
|
Update to new RebornCore
|
2015-12-11 19:48:16 +00:00 |
|
modmuss50
|
801964a92d
|
Bumped required forge version
|
2015-12-06 15:02:05 +00:00 |
|
modmuss50
|
f7477f5496
|
Removed fluid sources from creative tab.
|
2015-12-06 10:35:37 +00:00 |
|
modmuss50
|
c782b78959
|
Fixed build errors
|
2015-12-06 10:32:32 +00:00 |
|
modmuss50
|
ba90e49822
|
updated JEI, and improved support
|
2015-12-05 22:48:11 +00:00 |
|
modmuss50
|
5cf116d8a4
|
Missed conflict when merging
|
2015-12-05 20:32:18 +00:00 |
|
modmuss50
|
40f78c3938
|
Merge branch 'master' into 1.8.8
Conflicts:
build.gradle
|
2015-12-05 20:30:20 +00:00 |
|
Modmuss50
|
7c039f3105
|
Now build against java 1.7
|
2015-12-05 20:27:57 +00:00 |
|
modmuss50
|
8d0cc231d6
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-12-05 20:23:52 +00:00 |
|
modmuss50
|
cf36bc9dc1
|
Fixes #293 and removed java doc
|
2015-12-05 20:23:40 +00:00 |
|
modmuss50
|
a795f90971
|
Update forge, fix ticking tiles.
|
2015-12-05 20:14:32 +00:00 |
|
modmuss50
|
20af49394f
|
Fluid rendering, no more wasted block states
|
2015-12-05 19:37:42 +00:00 |
|
Modmuss50
|
f4c5c67c04
|
Update LICENSE.md
|
2015-11-30 11:17:45 +00:00 |
|
Modmuss50
|
60d7b63d5b
|
Merge remote-tracking branch 'refs/remotes/origin/master' into 1.8.8
# Conflicts:
# build.gradle
|
2015-11-29 12:29:42 +00:00 |
|
modmuss50
|
3fb7dd102b
|
Inital Just Enough Items support
|
2015-11-29 10:42:34 +00:00 |
|
modmuss50
|
3367e990be
|
Update to new forge and mappings
|
2015-11-29 09:52:45 +00:00 |
|
Modmuss50
|
86b60385c0
|
Update RebornCore
|
2015-11-29 09:38:37 +00:00 |
|
modmuss50
|
c02269f4d6
|
Merge branch '1.8.8' of https://github.com/TechReborn/TechReborn into 1.8.8
|
2015-11-28 12:52:04 +00:00 |
|
modmuss50
|
d5e2628f7a
|
Some small tweaks
|
2015-11-28 12:51:49 +00:00 |
|
Modmuss50
|
708fb8afbd
|
Merge remote-tracking branch 'refs/remotes/origin/master' into 1.8.8
|
2015-11-28 12:35:52 +00:00 |
|
Modmuss50
|
1dd47833c2
|
Version 0.7.1
|
2015-11-28 12:32:44 +00:00 |
|
modmuss50
|
ae5bb56445
|
Update build.gradle
|
2015-11-27 20:56:31 +00:00 |
|
modmuss50
|
6679c595c5
|
Some attempts at getting fluid to render.
|
2015-11-27 20:41:02 +00:00 |
|
modmuss50
|
0d4b9afd01
|
All Items now have textures
|
2015-11-27 20:17:12 +00:00 |
|
modmuss50
|
94a2229ed7
|
All block textures now work
|
2015-11-27 19:54:34 +00:00 |
|
modmuss50
|
1475554f8e
|
Bundle the ic2 wrench api
|
2015-11-27 19:21:52 +00:00 |
|
Modmuss50
|
52af3d2d2d
|
Removed null recipes
|
2015-11-27 13:15:19 +00:00 |
|
Modmuss50
|
285176e171
|
Large handfull of textures.
|
2015-11-26 21:48:30 +00:00 |
|
Modmuss50
|
d452ed5bfb
|
Disable src jar
|
2015-11-26 20:50:17 +00:00 |
|
Modmuss50
|
7370784c7f
|
More textures
|
2015-11-26 20:43:56 +00:00 |
|
Modmuss50
|
869e6d4bf8
|
Fixed compile errors
|
2015-11-26 19:33:52 +00:00 |
|
Modmuss50
|
b0784c44d2
|
Fixes for latest forge and more rendering.
|
2015-11-26 17:35:31 +00:00 |
|
Modmuss50
|
82b99fed34
|
update forge and mappings
|
2015-11-26 08:26:09 +00:00 |
|
Modmuss50
|
9f3622ea33
|
some more texture work
|
2015-11-25 21:03:55 +00:00 |
|
Modmuss50
|
f12725b4e0
|
Fixed charge hud, and clocking device.
|
2015-11-25 08:28:28 +00:00 |
|
Modmuss50
|
d56e6752c0
|
A lot of stuff looks better now
|
2015-11-24 22:58:18 +00:00 |
|
Modmuss50
|
0bb1375823
|
Added cell rendering
|
2015-11-24 21:39:22 +00:00 |
|
Modmuss50
|
fa11ff13bc
|
Build fix while waiting for an ic2 update
|
2015-11-24 19:44:24 +00:00 |
|
Modmuss50
|
46f4dc5d95
|
Prep for jenkins
|
2015-11-24 19:37:15 +00:00 |
|
Modmuss50
|
90628fad02
|
It runs
|
2015-11-23 20:37:20 +00:00 |
|
Modmuss50
|
bce444a4ff
|
0
|
2015-11-23 20:34:05 +00:00 |
|
Modmuss50
|
fe9d41ac76
|
50
|
2015-11-23 20:27:06 +00:00 |
|
Modmuss50
|
51d07ac8f5
|
571
|
2015-11-23 20:03:07 +00:00 |
|
Modmuss50
|
839647ed85
|
734
|
2015-11-23 19:51:40 +00:00 |
|
Modmuss50
|
ef82ceb714
|
790
|
2015-11-23 19:37:39 +00:00 |
|
