Commit graph

1667 commits

Author SHA1 Message Date
Blood-Asp
b8c7137b7d Update Crop Textures 2015-10-24 15:26:26 +02:00
Blood-Asp
f34e8a8d37 missing textures
The resources were missing all experimental textures.
2015-10-24 15:07:23 +02:00
Blood-Asp
50016ae707 Tried updating builds. Is this right?
cofhcore and cofhlib incompatible versions. Codechickencore missing.
Updated to a non broken forge version.
2015-10-24 14:56:00 +02:00
Shawn Buckley
1d56c33c86 Fixed spelling of sulfuric gas. Fixes #267 2015-10-23 17:00:18 -04:00
Shawn Buckley
c605e80a48 Merge branch 'master' into experimental 2015-10-21 22:37:48 -04:00
ShawnBuckley
ff95d2e31d Merge pull request #257 from ShawnBuckley/forestry4_gradle
Update forestry
2015-10-21 22:21:06 -04:00
Shawn Buckley
123aa6ed28 Reformat code 2015-10-21 22:15:09 -04:00
Shawn Buckley
9353aa711b Reformat code 2015-10-21 22:06:25 -04:00
Shawn Buckley
445e6c3f25 Replace T/F with builtin boolean values 2015-10-21 22:01:39 -04:00
Shawn Buckley
05316f03ab Update IC2 Nuclear control to 2.3.1a-Butt 2015-10-21 21:31:35 -04:00
ShawnBuckley
43ddecc7b9 Merge pull request #258 from ShawnBuckley/ic2nc_update
Update IC2 Nuclear control to 2.3.1a-Butt
2015-10-21 21:30:58 -04:00
Shawn Buckley
cda516a3e3 Update to Forestry 4 2015-10-21 21:30:33 -04:00
Blood-Asp
1a89d43ffc update api 2015-10-21 21:20:43 -04:00
Shawn Buckley
4548c34055 Update dependencies 2015-10-21 21:13:46 -04:00
Shawn Buckley
c68e84f1e2 Remove jdgui-comments 2015-10-21 21:11:56 -04:00
Shawn Buckley
34ecdfb190 Replace homegrown character comparision for builtin ones 2015-10-21 20:58:55 -04:00
Shawn Buckley
9bb514aac4 Add to .gitignore 2015-10-21 20:58:42 -04:00
Shawn Buckley
23ccc9bec2 Update ore dictionary logger header language 2015-10-21 20:56:11 -04:00
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