Commit graph

1479 commits

Author SHA1 Message Date
pahimar
40f7f3e854 Some improvements to how values are added to the EmcRegistry (checks for duplicates, and takes the lower value (default and pre-assign finished)) 2013-12-28 23:48:26 -05:00
pahimar
211c87930e Fixes https://github.com/pahimar/Equivalent-Exchange-3/issues/543 2013-12-28 21:20:57 -05:00
pahimar
ea118bf0ee Bumping minor version number to reflect that Jenkins now handles builds (no, the Jenkins page won't be public, but the outputted files will at a later date) 2013-12-28 21:11:53 -05:00
pahimar
76ba08c683 Testing jenkins+gradle config 2013-12-28 19:23:25 -05:00
pahimar
29db72ae9e Testing jenkins+gradle config 2013-12-28 19:21:03 -05:00
pahimar
1736a047ab Testing jenkins+gradle config 2013-12-28 19:14:25 -05:00
pahimar
4dd5c754e8 Testing jenkins+gradle config 2013-12-28 19:09:11 -05:00
pahimar
77723e22dc Testing jenkins+gradle config 2013-12-28 18:44:13 -05:00
pahimar
ec24381a5f Testing jenkins+gradle config 2013-12-28 18:41:08 -05:00
pahimar
bc0476e3d1 Testing jenkins+gradle config 2013-12-28 18:37:25 -05:00
pahimar
bb5e3d0e22 Testing jenkins+gradle config 2013-12-28 18:33:05 -05:00
pahimar
d67dc49671 Remove the test comment 2013-12-28 18:06:31 -05:00
pahimar
14b028c3ea Just a test to see how the Jenkins job is working 2013-12-28 17:59:37 -05:00
pahimar
57e22d4d71 Really, REALLY fix the fuel handler derp 2013-12-28 14:40:04 -05:00
pahimar
28b1a5edfc Fixes NEI + my fuel handler derp 2013-12-28 10:27:27 -05:00
Anton
8063a00141 Update ru_RU.lang 2013-12-28 16:29:17 +03:00
Vexatos
e8c5285b37 Resorting and stuff 2013-12-28 13:09:13 +01:00
pahimar
a2a129e321 Bump build number on account of the nightly I released 2013-12-28 00:22:19 -05:00
pahimar
371541a07a Re-jigged the alchemical fuels to conserve block/item ids 2013-12-28 00:08:13 -05:00
pahimar
65d71da66d Added Alchemical Coal, Mobius Fuel, and Aeternalis Fuel. EmcValues and crafting methods for them still to come 2013-12-27 19:54:31 -05:00
pahimar
6daa78de20 Just some refactoring before a sprint of work tomorrow 2013-12-26 20:59:51 -05:00
pahimar
1bcfc551be And now for the XCFs 2013-12-26 11:18:53 -05:00
pahimar
7ac6988b6f Forgot to commit the textures 2013-12-26 11:18:00 -05:00
Vexatos
a02b7c9cd9 I know it's Latin. That's why I don't translate it 2013-12-26 09:30:45 +01:00
pahimar
aad4435415 Just a few items you might know of from before 2013-12-25 08:50:07 -05:00
crafteverywhere
8ab9d28470 Update zh_CN.lang 2013-12-24 21:42:07 +08:00
Vexatos
49c3503417 Update de_DE.lang 2013-12-24 14:22:09 +01:00
pahimar
60423c1421 Calcinators now produce dust 2013-12-23 22:13:57 -05:00
pahimar
b69954c4c5 Just some more quick work before going out yet again for Christmas 2013-12-23 08:47:37 -05:00
pahimar
0e47572bac Just some quick work before going out yet again for Christmas 2013-12-23 08:41:34 -05:00
pahimar
6dee38c4e1 Some more work on the CalcinationManager 2013-12-21 22:03:32 -05:00
pahimar
10bb34ae47 Merge remote-tracking branch 'origin/master' 2013-12-21 19:42:33 -05:00
pahimar
434650a7d8 Forcing EmcValues to have (at most) 4 points of precision 2013-12-21 19:42:18 -05:00
pahimar
a6486df7fa Forcing EmcValues to have (at most) 4 points of precision 2013-12-21 18:47:55 -05:00
pahimar
2ca30f4845 Some mucking about 2013-12-21 17:16:55 -05:00
pahimar
3be12ee169 Thought I would have gotten more done at work today :) 2013-12-20 15:53:37 -05:00
pahimar
f0b08b431f Cleaning 2013-12-20 06:58:15 -05:00
pahimar
e2378f77b6 Cleaning 2013-12-19 18:41:22 -05:00
pahimar
a545d4519e Stop container items from affecting EmcValue assignment 2013-12-19 17:59:31 -05:00
pahimar
cc74d32ffb Merge pull request #517 from kaendfinger/master
Reformated build.gradle
2013-12-19 05:55:25 -08:00
pahimar
8db88278f3 Reminder to self 2013-12-19 00:23:06 -05:00
pahimar
84a0410815 Reminder to self 2013-12-19 00:21:58 -05:00
pahimar
b5bf06b9f7 Bunch of work on FluidStack handling in DynEmc stuffs 2013-12-19 00:19:15 -05:00
pahimar
d2ac6dbf1b Merge pull request #520 from 50Wliu/master
Updated README.md
2013-12-18 17:15:11 -08:00
Wliu
ac676e470b Fixed awkward wording
Want to kill Markdown right now...
2013-12-18 17:51:11 -05:00
Wliu
d935ae701d I hate Markdown's line breaks 2013-12-18 17:47:25 -05:00
Wliu
0b2881aa13 Hopefully fixed line breaks <.<
Also mae README links relative and a whole lot shorter
2013-12-18 17:42:28 -05:00
Wliu
a258918839 Refactored the README
Makes it a whole lot more linear now
Also added a FAQ (WIP)
2013-12-18 17:39:29 -05:00
pahimar
2285f4e33b Work on EquivalencyStack 2013-12-17 21:07:30 -05:00
Kenneth Endfinger
908098c24a Bug Fix, put incrementBuildNumber in doLast {} 2013-12-17 20:01:23 -05:00