pahimar
|
5ab19755ca
|
Merge pull request #547 from ganymedes01/master
Chalk block recipe is wrong
|
2013-12-30 18:39:15 -08:00 |
|
ganymedes01
|
d7300d6bde
|
Correct chalk block recipe
|
2013-12-31 00:36:59 +00:00 |
|
|
pahimar
|
3ae4e5d2ba
|
Other than some display related stuff, the Calcinator is pretty much "done"
|
2013-12-30 17:53:28 -05:00 |
|
|
pahimar
|
3808722bfc
|
Merge pull request #546 from 50Wliu/README
Updated README.md
|
2013-12-30 13:40:37 -08:00 |
|
Wliu
|
d4fc2c5edb
|
In my amazing genius, I renamed FAQ to FRQ. <.<
|
2013-12-30 16:38:06 -05:00 |
|
|
Wliu
|
1ee07d6bf9
|
Much cleaner way of getting rid of the FAQ...
|
2013-12-30 16:36:01 -05:00 |
|
|
Wliu
|
f22e53de67
|
Changed Fedora's Gradle installation instructions
Also moved the FAQ to the wiki per Lluixhi's recommendation
|
2013-12-30 16:30:41 -05:00 |
|
|
pahimar
|
3c5577226d
|
Cleaning up some stuff
|
2013-12-29 22:49:18 -05:00 |
|
|
pahimar
|
ed463d38c2
|
Some simple particle effects for the fire pot on the calcinator
|
2013-12-29 22:44:06 -05:00 |
|
|
pahimar
|
32615463ac
|
Some work on getting the Calcinators GUI to be more informative. Some small corner cases remain. That, and rendering it when its active.
|
2013-12-29 22:04:57 -05:00 |
|
|
pahimar
|
4066e6f6b0
|
Fix up the EmcValue for chalk, and added some recipes to make chalk blocks from 4 pieces of chalk
|
2013-12-29 00:45:46 -05:00 |
|
|
pahimar
|
1c23ca22aa
|
Fix corner cases which would have allowed duplicate entries to be attempted in EmcRegistry
|
2013-12-29 00:32:20 -05:00 |
|
Asajz
|
442dca2a68
|
Update es_ES.lang
A few minor changes to fix grammar.
|
2013-12-28 22:59:04 -06:00 |
|
|
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 |
|