Commit graph

1150 commits

Author SHA1 Message Date
pahimar
2c35d3adca Just some bleary eyed, crack of dawn, coding 2013-07-22 06:48:31 -04:00
nick tsip
72f0c2fcae Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3 2013-07-19 15:10:28 +03:00
davidog23
08e40c5ab5 Update es_ES.xml
Syntactic and grammatical corrections to es_ES localization
2013-07-17 20:15:47 +02:00
pahimar
79adec9ed5 Merge pull request #384 from Lunatrius/localization
Added sl_SI.xml
2013-07-16 15:53:25 -07:00
Lunatrius
68c58e39ca Added sl_SI.xml 2013-07-16 23:03:31 +02:00
pahimar
e3bba6ff71 Merge pull request #397 from Zmiko/1.6.2
Renamed sr_RS to sr_SP. (1.6.2)
2013-07-16 13:08:15 -07:00
pahimar
4a7fbd7a17 Merge pull request #398 from Asajz/master
Updated Spanish Lang File
2013-07-16 13:07:07 -07:00
Asajz
87c27539ab Updated to new location for 1.6 2013-07-16 12:30:27 -05:00
Zmiko
93804744d1 Rename sr_RS to sr_SP in Localizations.java. 2013-07-16 19:24:08 +02:00
Zmiko
8126636067 Update sr_SP.xml 2013-07-16 19:23:07 +02:00
Zmiko
1ab65bcbdc Renaming sr_RS into sr_SP. 2013-07-16 19:21:44 +02:00
pahimar
bfce1e28a9 Merge pull request #396 from 50Wliu/Localization
pt_BR update
2013-07-16 05:43:52 -07:00
Wliu
6145e5a0fe pt_BR update
See #385
2013-07-15 20:56:04 -04:00
pahimar
09fe8c8c85 Cleaning up some imports and formatting 2013-07-15 20:51:54 -04:00
pahimar
4dac7c1bde Stuff! 2013-07-15 19:21:00 -04:00
pahimar
48a16c676e Initial port to MC 1.6.2, some things are still broke 2013-07-15 15:31:25 -04:00
pahimar
77c1560c24 Merge pull request #394 from 50Wliu/README
Updated README.md
2013-07-14 18:11:12 -07:00
Wliu
10312ac65c And updated the PR part
Sigh.
2013-07-14 21:00:39 -04:00
Wliu
2ccd44a55e README update
-Removed spaces between links
-Removed some now-useless stuff, and added a generalization (the
IMPORTANT part)
-Updated Java version
-Clarified Github for Windows/Mac part
-Updated for pahimar's build.xml change (ant build)
-Updated for Repository Next
(https://github.com/blog/1529-repository-next)
That should be it ;)
2013-07-14 20:56:26 -04:00
nick tsip
a69a0aa54c Fixed some spelling errors in the greek localizations 2013-07-14 12:04:01 +03:00
pahimar
b92834ec71 Dropping the decoding of NBT from string (really complex) 2013-07-12 15:47:48 -04:00
pahimar
dbad459d90 More work on DynEMC and EMC values 2013-07-11 15:41:10 -04:00
pahimar
7da16caa44 More work on IMC stuffs 2013-07-10 21:04:18 -04:00
pahimar
32ff63be6b More work on IMC 2013-07-10 16:01:04 -04:00
pahimar
f246b75a26 Some first methods to encode/decodes stacks to/from NBT (for later use with InterModCommunications). Part of the API. Likely to be refactored in the future as needed. 2013-07-08 15:26:37 -04:00
pahimar
f8e79bbcba Move around some NBT related stuff 2013-07-04 15:48:31 -04:00
pahimar
b04b88f4d4 Move around some stuff 2013-07-03 20:31:07 -04:00
pahimar
c1efbe06a7 Clean out the old transmutation stone recipes (obsolete once DynEMC is finished), fix up discovering all recipeless items 2013-07-03 18:57:58 -04:00
pahimar
05be819d18 Move the recipe stuff to the more logical location (RecipeRegistry vs DynEMC) 2013-07-03 16:26:10 -04:00
pahimar
9a482adcff Changes to RecipeHelper to solve the case where recipes have individual item stacks with a stack size > 1, and a general method to ensure items without recipes (but that are accessibly via the vanilla Items list) are added to the recipe registry as having no recipe 2013-07-03 16:13:38 -04:00
pahimar
1591f537c3 Organizing imports, cleaning up formatting, and lots of work on recipe registry in prep for building the new DynEMC graph structure 2013-07-03 14:36:35 -04:00
pahimar
fa838f34bc Bit more DynEMC work (busy day today). More to do on the vanilla side of things tonight. 2013-07-02 15:41:40 -04:00
pahimar
bdb138cf17 Vanilla smelting "recipes" now also provide output that can be consumed by the DynEMC system 2013-06-28 15:27:21 -04:00
pahimar
71a2fe3864 Remove references to EE3's logger and use it's own logger for WeightedDirectedGraph (more mod agnostic now) 2013-06-28 11:21:44 -04:00
pahimar
2d95d550a4 Took care of the case of the mundane splash potions 2013-06-28 11:07:13 -04:00
pahimar
edb489bdd4 Yay, adding the potion recipes to my recipe registry seem to work. That ought to reduce my critical node count 2013-06-27 22:35:42 -04:00
pahimar
fa8a51acc2 Oh yay, splash potions can be brewed together too. That's fun. Oh, happy birthday commit for me :D 2013-06-27 22:14:59 -04:00
pahimar
bb5d46d36b More work on potion recipes 2013-06-27 16:01:32 -04:00
pahimar
5d580a5156 More potion recipe work 2013-06-24 22:22:19 -04:00
pahimar
b56edebe9a Some work on how to determine brewing relationships 2013-06-24 00:04:43 -04:00
pahimar
a42a52971f More work on more intelligent recipe input collation (and swapping of wild card metas). More work still to be done 2013-06-23 23:48:49 -04:00
pahimar
5f7ea23a4f Blargh 2013-06-21 13:04:55 -04:00
pahimar
9ac6722860 Some more work on DynEMC 2013-06-18 22:20:50 -04:00
pahimar
87f1108632 Simplify the custom wrapped stack wrapper, and workon a RecipeManager 2013-06-12 16:01:45 -04:00
pahimar
976df1d39b Hacky hacky hack hack fix for decrementing a container itemstack before getting the results of using the container item stack. Will only hold until we move to the new transmutation system. 2013-06-11 15:33:19 -04:00
pahimar
c8b4c4e642 Renaming some stuff, adding more functionality to the LogHelper, and ItemStack wild card detection for the vanilla Crafting Manager 2013-06-11 14:11:56 -04:00
pahimar
a5209fab99 Merge pull request #375 from Hanse00/patch-1
Fixed left / right error
2013-06-10 09:37:34 -07:00
pahimar
00df5d294a Merge pull request #369 from pwnedary/master
32x shardMinium texture
2013-06-10 09:37:19 -07:00
pahimar
9bca6ef589 Merge pull request #377 from aysorth/master
pl_PL.xml update
2013-06-10 09:36:00 -07:00
Mateusz Micał
4eaeaed18c consistency fix 2013-06-10 10:37:58 +02:00