Commit graph

1387 commits

Author SHA1 Message Date
pahimar 49e7bb97d8 Adding some preliminary work on the Research Station 2014-01-02 22:48:09 -05:00
pahimar ad6e7f3f3a Keybinding optimization 2014-01-02 21:33:04 -05:00
pahimar eb9205f189 Changing up how the EMC overlay works 2014-01-02 20:54:54 -05:00
pahimar 0f4746336d EmcValues 2014-01-02 20:35:21 -05:00
pahimar e4b0f8a99c EmcValues 2014-01-02 20:32:28 -05:00
pahimar 6efe7ebe9a More optimization of the codebase 2014-01-02 16:09:59 -05:00
pahimar ea3fcd11b7 Merge pull request #552 from JohnSmith114/master
Corrected some errors and finished the Version check localizations on it_IT.lang
2014-01-02 12:51:47 -08:00
pahimar 76ab773b57 Merge pull request #551 from VeryBigBro/patch-3
Update ru_RU.lang
2014-01-02 12:51:42 -08:00
pahimar a55b3ff091 Merge pull request #549 from Leon1236/patch-2
Create hr_HR.lang
2014-01-02 12:51:37 -08:00
JohnSmith114 2bb065bf65 Corrected some errors and finished the Version check localizations 2014-01-02 21:34:46 +01:00
Anton c74b4c6619 Update ru_RU.lang 2014-01-02 14:35:03 +03:00
pahimar 8ed0f1ecdd Some optimizing of Item code 2014-01-02 03:55:01 -05:00
pahimar 391cd2b03d Block fixes 2014-01-02 03:19:19 -05:00
pahimar df8aa8e7d9 Localization stuffs 2014-01-02 02:35:25 -05:00
pahimar b6094df8c6 Changing around some textures 2014-01-02 02:25:56 -05:00
pahimar 898e7b44f6 Optimizing a ton of stuff in the block classes 2014-01-02 02:21:46 -05:00
pahimar 2b66e13ff2 Just some stuff 2014-01-02 01:00:00 -05:00
pahimar 22170ede54 Fixed #550 2014-01-01 22:15:28 -05:00
pahimar 0114340844 Some preliminary work on transmutation squares 2014-01-01 21:18:10 -05:00
pahimar 8b17f1fa26 Playing around with some stuff 2014-01-01 18:18:59 -05:00
Leon1236 b92ea5741d Create hr_HR.lang
Added Croatian translation by Leon1236
2014-01-01 20:35:14 +01:00
pahimar 4abd5b121a Reverting out last MCPC+ bugfix changes - looks like the bug is best resolved on MCPC+'s side (marking ItemStack.EntityItemFrame as transient, and so preventing gson'd ItemStacks from overflowing the stack) 2013-12-31 03:42:32 -05:00
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