Commit graph

1250 commits

Author SHA1 Message Date
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
e154c15fd9 Prep for update for new reborn core 2016-01-24 11:37:19 +00:00
Modmuss50
5304e38502 Update README.md 2016-01-16 13:27:11 +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
gigabit101
1ed3d226f2 Closes #320 2016-01-16 04:27:17 +00:00
modmuss50
eca3534d1e fixes #324 2016-01-13 15:41:30 +00:00
Modmuss50
c000c47f7c update: Please see http://techreborn.ninja/?p=20 2016-01-12 19:15:22 +00:00
modmuss50
11ab05da00 Remove FastBuild 2016-01-04 23:07:54 +00:00
modmuss50
7ecdd27752 Start work on porting from the MT script 2016-01-03 19:07:31 +00:00
modmuss50
93f039c71b Merge branch 'master' of https://github.com/TechReborn/TechReborn 2016-01-02 01:40:21 +00:00
modmuss50
b242ec5c5f Cut all the things! 2016-01-02 01:40:11 +00:00
Modmuss50
efdc9db725 Update README.md 2015-12-25 22:31:11 +00:00
Modmuss50
024a13375e Version 0.7.4 2015-12-19 09:52:00 +00:00
modmuss50
5821dbfe0e Added config to CompatManager to allow disabling of handlers. 2015-12-18 19:17:11 +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
96a7b56b5f Fixes #304 2015-12-16 15:56:12 +00:00
Modmuss50
5324016199 fixes #302 2015-12-16 11:07:34 +00:00
Modmuss50
23255bdfff Fixes #301 2015-12-14 18:13:47 +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
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
cc6dfbc3c4 Fixes #295 2015-12-11 21:52:35 +00:00
Modmuss50
5c95b238fa Fixes #296 2015-12-11 21:33:32 +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
f4c5c67c04 Update LICENSE.md 2015-11-30 11:17:45 +00:00
Modmuss50
86b60385c0 Update RebornCore 2015-11-29 09:38:37 +00:00
Modmuss50
1dd47833c2 Version 0.7.1 2015-11-28 12:32:44 +00:00
modmuss50
3db2db3c7c Small fix. 2015-11-22 16:27:15 +00:00
modmuss50
7bcc793d12 Added javaDoc and updated deps 2015-11-22 16:24:50 +00:00
modmuss50
d545521d04 Added PlayerDectector closes #286 2015-11-22 11:16:54 +00:00
modmuss50
05e7ecf2f3 Removed sout lines 2015-11-22 10:33:21 +00:00
modmuss50
48a7f1cc6d Fixes #290 2015-11-22 10:27:33 +00:00
Modmuss50
d928472d84 Fixes #219 2015-11-21 08:54:26 +00:00
Modmuss50
f2e41cf360 Update README, no longer is a core mod 2015-11-19 19:36:45 +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
Modmuss50
276bf8355f Computer Cube now shows PDA gui 2015-11-18 19:51:41 +00:00
Modmuss50
806cf757a5 Fixes #264 2015-11-18 19:41:37 +00:00
Modmuss50
0f09088813 Fixes #282 2015-11-18 18:36:00 +00:00
Modmuss50
a47b1b1f27 Fixes #281 2015-11-18 18:35:03 +00:00
Modmuss50
3f41e26ece Fixes some issues with the fustion reactor. 2015-11-18 17:02:22 +00:00
Gigabit101
885a6ad76d Merge pull request #276 from Mazdallier/patch-2
Update fr_FR.lang
2015-11-18 16:42:00 +00:00
Modmuss50
66993f7239 Gradle 2.9 2015-11-18 11:22:56 +00:00
Modmuss50
93d1ff57b7 Fixed in world multiblock preview 2015-11-18 11:10:03 +00:00