modmuss50
|
54817286e6
|
Revert "test to fix build issue"
This reverts commit eed1a7a719.
|
2015-12-30 17:09:17 +00:00 |
|
modmuss50
|
0c7f07001b
|
temp remove jei support to track down build issue.
|
2015-12-30 17:06:24 +00:00 |
|
modmuss50
|
eed1a7a719
|
test to fix build issue
|
2015-12-30 16:38:52 +00:00 |
|
modmuss50
|
895d5cfdd9
|
1.8.9 update
|
2015-12-30 11:57:06 +00:00 |
|
modmuss50
|
b2cd388527
|
remove this for later
|
2015-12-28 11:08:14 +00:00 |
|
modmuss50
|
d973d6b108
|
Added back some more compat
|
2015-12-28 10:57:22 +00:00 |
|
Modmuss50
|
efdc9db725
|
Update README.md
|
2015-12-25 22:31:11 +00:00 |
|
modmuss50
|
df213bc22a
|
Merge branch '1.8.8' of https://github.com/TechReborn/TechReborn into 1.8.8
|
2015-12-23 12:43:53 +00:00 |
|
modmuss50
|
2320ceb2c3
|
Fixed machines loosing state
|
2015-12-23 12:40:48 +00:00 |
|
modmuss50
|
48a94205e2
|
Merge branch 'master' into 1.8.8
# Conflicts:
# build.gradle
|
2015-12-19 09:53:54 +00:00 |
|
Modmuss50
|
024a13375e
|
Version 0.7.4
|
2015-12-19 09:52:00 +00:00 |
|
Modmuss50
|
13d3d475fd
|
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
|
2015-12-18 19:39:43 +00:00 |
|
modmuss50
|
5821dbfe0e
|
Added config to CompatManager to allow disabling of handlers.
|
2015-12-18 19:17:11 +00:00 |
|
modmuss50
|
8e3136ecf0
|
Update deps, for #307
|
2015-12-18 18:56:45 +00:00 |
|
Modmuss50
|
f17cd36815
|
Update merged commits to 1.8.8
|
2015-12-16 17:13:17 +00:00 |
|
Modmuss50
|
0fdba82490
|
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
# Conflicts:
# src/main/java/techreborn/compat/CompatManager.java
|
2015-12-16 17:10:25 +00:00 |
|
Modmuss50
|
741c25a5a2
|
Standalone recipes!
|
2015-12-16 17:04:37 +00:00 |
|
Modmuss50
|
0c80f2beda
|
More recipes, work on #182
|
2015-12-16 16:40:47 +00:00 |
|
Modmuss50
|
eedabb9e7d
|
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
# Conflicts:
# src/main/java/techreborn/client/gui/GuiGrinder.java
# src/main/java/techreborn/tiles/TileGrinder.java
|
2015-12-16 16:06:33 +00:00 |
|
Modmuss50
|
96a7b56b5f
|
Fixes #304
|
2015-12-16 15:56:12 +00:00 |
|
Modmuss50
|
5324016199
|
fixes #302
|
2015-12-16 11:07:34 +00:00 |
|
Modmuss50
|
fbc5291a1d
|
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
|
2015-12-14 18:14:12 +00:00 |
|
Modmuss50
|
23255bdfff
|
Fixes #301
|
2015-12-14 18:13:47 +00:00 |
|
Modmuss50
|
7c48afa63c
|
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
|
2015-12-14 17:47:28 +00:00 |
|
Modmuss50
|
236eafd99d
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-12-14 17:45:23 +00:00 |
|
Modmuss50
|
6df6dbfdf5
|
Fixes #300
|
2015-12-14 17:45:06 +00:00 |
|
Modmuss50
|
b924b3f36d
|
Version 0.7.3
|
2015-12-14 11:08:11 +00:00 |
|
Modmuss50
|
08c0e2d81e
|
Fixes #299
|
2015-12-14 11:06:25 +00:00 |
|
Modmuss50
|
efd19336bf
|
Revert "Load TechReborn before RebornCore might help with #299"
This reverts commit a1194698cb.
|
2015-12-14 08:31:39 +00:00 |
|
Modmuss50
|
a1194698cb
|
Load TechReborn before RebornCore might help with #299
|
2015-12-14 08:24:13 +00:00 |
|
Modmuss50
|
abcaccdc82
|
Added waila support back
|
2015-12-13 19:41:46 +00:00 |
|
Modmuss50
|
67d2d9c863
|
Update reborn core
|
2015-12-13 18:09:48 +00:00 |
|
modmuss50
|
3b3deea57b
|
update things
|
2015-12-13 13:29:15 +00:00 |
|
modmuss50
|
fb6b5135e4
|
Merge branch 'master' into 1.8.8
# Conflicts:
# ToAddBack/partSystem/parts/CablePart.java
|
2015-12-12 17:39:23 +00:00 |
|
Modmuss50
|
cf3d795c27
|
Version 0.7.2
|
2015-12-12 17:38:18 +00:00 |
|
Modmuss50
|
d64928b4e4
|
Added more null checks, might fix #297
|
2015-12-12 11:48:34 +00:00 |
|
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 |
|
