Commit graph

1649 commits

Author SHA1 Message Date
Shawn Buckley
bea4cfc545 Bring in experimental branch 2015-10-21 20:47:13 -04:00
Shawn Buckley
1185424fa7 Move source files 2015-10-21 20:46:52 -04:00
Shawn Buckley
ad473b9ac0 Update IC2 Nuclear control to 2.3.1a-Butt 2015-10-20 21:23:33 -04:00
Shawn Buckley
90f38a5046 Update forestry 2015-10-20 21:19:02 -04:00
Blood-Asp
58d3a1c5dd update api 2015-10-20 22:56:25 +02:00
Blood-Asp
57efa552e7 Merge pull request #253 from JonnyNova/tf_squash
Replace GT_Values.T/F with java primitive boolean values
2015-10-20 22:47:09 +02:00
Blood-Asp
70c116c3df update to forestry 4.0 2015-10-20 22:46:18 +02:00
Blood-Asp
efb34b3274 Merge pull request #252 from JonnyNova/char_comparison
Replace homegrown character comparision for builtin ones
2015-10-20 21:51:41 +02:00
Shawn Buckley
49e6015068 Replace GT_Values.T/F with java primitive boolean values 2015-10-19 20:48:52 -04:00
Shawn Buckley
7150103150 Replace homegrown character comparision for builtin ones 2015-10-19 19:49:28 -04:00
Blood-Asp
ba53c6004c Merge pull request #250 from ShawnBuckley/gitignore
Add to .gitignore
2015-10-20 00:24:52 +02:00
Blood-Asp
9202e2bfe3 Merge pull request #249 from ShawnBuckley/source-move
Move source directory
2015-10-20 00:24:30 +02:00
Blood-Asp
9367648dd6 Merge pull request #248 from ShawnBuckley/gradle
Update gradle dependencies
2015-10-20 00:24:20 +02:00
Shawn Buckley
ab0559cba0 Remove unused subversion property 2015-10-19 17:42:07 -04:00
Shawn Buckley
16997a455f Correct build.properties to use Forge 1481 2015-10-19 10:47:11 -04:00
Shawn Buckley
d510437b8a Add to .gitignore 2015-10-18 23:12:23 -04:00
Shawn Buckley
85c804fa11 Move source directory 2015-10-18 23:04:39 -04:00
Shawn Buckley
02d954475d Organize build.properties 2015-10-18 22:54:59 -04:00
Shawn Buckley
e4f5504a89 Update dependencies 2015-10-18 22:50:44 -04:00
Blood-Asp
ce25063b91 Merge pull request #232 from ShawnBuckley/jdgui-comments
Removed JD comments
2015-10-18 17:29:43 +02:00
Blood-Asp
197225027a Merge pull request #231 from ShawnBuckley/ore-logger
Update ore dictionary logger header language
2015-10-18 17:29:22 +02:00
Blood-Asp
513c6606f2 GT5.08.31 2015-10-18 17:28:51 +02:00
Shawn Buckley
22202a5fd7 Removed JD comments 2015-10-14 22:33:33 -04:00
Shawn Buckley
836aac1d1a Update ore dictionary logger header language 2015-10-14 17:34:26 -04:00
Blood-Asp
6d8abce427 first half of 5.08.31 2015-10-12 01:23:48 +02:00
Blood-Asp
9d85f43d56 Another hotfix 2015-10-04 00:33:15 +02:00
Blood-Asp
452431a40a Hotfix 2015-10-03 23:15:52 +02:00
Blood-Asp
6d9c73a70a Update version 5.08.30 2015-10-03 15:23:52 +02:00
Blood-Asp
c3fd04d6f4 Merge pull request #201 from TehporP/master
Create zh_CN.lang
2015-10-01 14:24:34 +02:00
TehporP
14224334fe Create zh_CN.lang 2015-10-01 10:56:42 +08:00
Blood-Asp
b4e3f96c21 Merge pull request #199 from pyure/patch-3
Large Boilers now accept distilled water (w/o exploding)
2015-10-01 00:25:23 +02:00
Blood-Asp
183cfa6f06 Merge pull request #195 from mezz/master
Fix #194 Annoying sounds with Forestry Worktable
2015-10-01 00:25:11 +02:00
Blood-Asp
528cd9a89f Merge pull request #193 from pyure/master
#186: Hatch names and descriptive tooltips
2015-10-01 00:25:03 +02:00
Blood-Asp
4b000b64ab Merge pull request #176 from doushio9967/advcircuit-achievement-fix2
Let GT AdvCircuits trigger the stepforward achievement.
2015-10-01 00:24:54 +02:00
pyure
fe24c662b2 Large Boilers now accept distilled water (w/o exploding) 2015-09-28 18:55:23 -04:00
mezz
37def8854d Fix #194 Annoying sounds with Forestry Worktable 2015-09-25 16:46:07 -07:00
pyure
27d4848463 Really minor convention tweak in block_ores
Returning from the default clause of a switch stops eclipse from bitching about unhandled enums.
2015-09-25 18:25:21 -04:00
pyure
144d01c254 Tier acronym added to hatch names 2015-09-23 20:00:24 -04:00
pyure
ccdca47378 Descriptive tooltip added for hatch 2015-09-23 19:54:06 -04:00
pyure
ce9c4fa737 Descriptive tooltip added for hatch 2015-09-23 19:53:34 -04:00
pyure
00fdecb382 Descriptive tooltip added for hatch 2015-09-23 19:52:49 -04:00
pyure
ecc7df01b4 Descriptive tooltip added for hatch 2015-09-23 19:51:53 -04:00
pyure
0ad3c057b1 Update GT_MetaTileEntity_Hatch.java
getSlots() static method added
2015-09-23 19:50:40 -04:00
doushio9967
8aec6864e1 Let GT AdvCircuits trigger the stepforward achievement. 2015-09-11 12:02:37 +02:00
Blood-Asp
4d9fd9fb86 update gitignore 2015-09-05 23:29:34 +02:00
Blood-Asp
1f3bb4317f GT5.08.29 2015-09-05 23:18:46 +02:00
Blood-Asp
fbf9df8b2e error revert 2015-09-05 00:48:39 +02:00
Blood-Asp
31c80e0078 Merge remote-tracking branch 'origin/master' 2015-09-05 00:46:03 +02:00
Blood-Asp
0cb1cbd6bc Version 5.08.28 2015-09-05 00:43:17 +02:00
Blood-Asp
683d46f4c8 Merge pull request #156 from InfinityStudio/master
Fixed large steam turbine do not consume steam.
2015-08-30 17:26:36 +02:00