pahimar
|
4caf4e1237
|
Another attempt at the MCPC+ bug
|
2013-12-31 03:23:06 -05:00 |
|
pahimar
|
3c3c17d18b
|
Another attempt at the MCPC+ bug
|
2013-12-31 03:04:50 -05:00 |
|
pahimar
|
6728bd5871
|
Another attempt at the MCPC+ bug
|
2013-12-31 02:39:17 -05:00 |
|
pahimar
|
13f3ccd175
|
Another attempt at the MCPC+ bug
|
2013-12-31 02:30:41 -05:00 |
|
pahimar
|
5dc0d1a973
|
Another attempt at the MCPC+ bug
|
2013-12-31 02:07:23 -05:00 |
|
pahimar
|
fa283b24eb
|
Seems like it worked for WrappedStack! Now to fix RecipeMapping
|
2013-12-31 01:56:15 -05:00 |
|
pahimar
|
ebccba0d3b
|
Another attempt at the MCPC+ bug
|
2013-12-31 01:50:47 -05:00 |
|
pahimar
|
31cb980a52
|
Another attempt at fixing the MCPC+ and EE3 gson bug
|
2013-12-31 01:37:42 -05:00 |
|
pahimar
|
e0a2395c72
|
Moving some things around, and may have fixed the Gson issue with MCPC+
|
2013-12-31 01:24:35 -05:00 |
|
pahimar
|
458ec07c21
|
Fixes https://github.com/pahimar/Equivalent-Exchange-3/issues/373
|
2013-12-31 00:36:51 -05:00 |
|
pahimar
|
98188ba872
|
Fixes https://github.com/pahimar/Equivalent-Exchange-3/issues/506
|
2013-12-31 00:25:47 -05:00 |
|
pahimar
|
bf7eeb97ed
|
Merge remote-tracking branch 'origin/master'
|
2013-12-31 00:12:17 -05:00 |
|
pahimar
|
6c072974f3
|
Fixes https://github.com/pahimar/Equivalent-Exchange-3/issues/532
|
2013-12-31 00:12:02 -05:00 |
|
pahimar
|
dc6fe0576a
|
Merge pull request #530 from Vexatos/patch-1
Updated de_DE.lang
|
2013-12-30 21:08:42 -08:00 |
|
pahimar
|
3909894172
|
Merge pull request #539 from VeryBigBro/patch-2
Update ru_RU.lang
|
2013-12-30 21:08:34 -08:00 |
|
pahimar
|
926942131b
|
Merge pull request #544 from Asajz/patch-1
Update es_ES.lang
|
2013-12-30 21:08:25 -08:00 |
|
pahimar
|
c6de187b69
|
Merge pull request #531 from crafteverywhere/patch-6
Update zh_CN.lang
|
2013-12-30 21:08:16 -08:00 |
|
pahimar
|
5e9a29123d
|
Testing moving the EmcRegistry initialization to its own thread
|
2013-12-30 23:51:15 -05:00 |
|
pahimar
|
56d24ef958
|
More testing
|
2013-12-30 23:12:31 -05:00 |
|
pahimar
|
66b2cfcfc0
|
Taking this to extremes to test this damned NEI + EE3 "bug"
|
2013-12-30 22:58:17 -05:00 |
|
pahimar
|
f9ef8c92bc
|
Remember to turn them off Pahimar, sheesh
|
2013-12-30 22:34:19 -05:00 |
|
pahimar
|
927bce7c28
|
Testing to see if tooltips are the cause of the EE3 + NEI "lag"
|
2013-12-30 22:33:15 -05:00 |
|
pahimar
|
3039c2d71d
|
Some preliminary work on transmutation squares
|
2013-12-30 21:41:10 -05:00 |
|
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 |
|