Commit graph

1084 commits

Author SHA1 Message Date
pahimar
376b37d4bf Underped my generics 2013-05-29 15:03:49 -04:00
pahimar
12e80773ed Again, for more review 2013-05-29 14:00:06 -04:00
pahimar
4bd9ae52f2 Commiting for a review 2013-05-29 13:42:44 -04:00
pahimar
28d7216096 Some graph work before I had to go out, will continue later today 2013-05-29 06:45:30 -04:00
pahimar
13b43a3d29 Merge pull request #370 from MrTJP/patch-1
Huh, I pushed a fix for this earlier but apparently it didn't take. I'll merge this one in.

Rename EMCBlackList.java to EmcBlackList.java
2013-05-27 09:32:19 -07:00
MrTJP
70a63e8ad2 Rename EMCBlackList.java to EmcBlackList.java
Wrong file name. Class was declared EmcBlackList
2013-05-27 13:06:55 -03:00
pahimar
67fcd20e21 Finally fixed the transmutation stone crafting recipe bug, careof https://github.com/cpw. 2013-05-27 11:34:19 -04:00
pwnedary
29d94ecea3 32x shardMinium texture 2013-05-27 14:47:09 +02:00
pahimar
6749a3a68e Population of Equivalency Groups from the OreDicitonary 2013-05-26 23:55:12 -04:00
pahimar
8db11a7c8c Restructuring how EMC stuffs are stored 2013-05-26 23:02:24 -04:00
pahimar
4acc41c2c8 Tidying 2013-05-26 20:09:29 -04:00
pahimar
163083bc89 Some work on a blacklist to prevent items from receiving EMC values 2013-05-26 18:37:08 -04:00
pahimar
521982bed9 Some work on a simple itemstack wrapper 2013-05-23 16:07:07 -04:00
pahimar
ea1c022498 Messy attempt at a blacklist to avoid the possibility of assigning emc values to unavailable ids 2013-05-23 00:00:31 -04:00
pahimar
156c146220 Some renaming of classes, automated itemstack discovery 2013-05-22 00:08:53 -04:00
pahimar
37533a949f Some name changes, getting rid of some code warnings, and removing the reconstructive recipes to avoid exploits 2013-05-20 14:26:26 -04:00
pahimar
333fd67368 Didn't mean to take this block out, yet 2013-05-20 00:20:59 -04:00
pahimar
ad4fb23535 Renamed the helper package to util, and work on better recipe inspection and result collation. 2013-05-20 00:19:26 -04:00
pahimar
d6367c90fd Primitive first pass at a ItemStack comparator, and some more functionality for the RecipeHelper 2013-05-18 00:33:23 -04:00
pahimar
97f9daccc9 Helper methods for getting the inputs of a given IRecipe 2013-05-16 16:07:39 -04:00
pahimar
3e65a04f1e Shift clicking work for all existing and implemented container inventories 2013-05-14 21:07:52 -04:00
pahimar
59929c9c82 Some container shift clicking work 2013-05-14 16:15:50 -04:00
pahimar
9e15f7aeb8 toString methods for the EE3 tile entities, and fixing lighting for the Aludel and the Glass Bell 2013-05-14 14:50:22 -04:00
pahimar
fc58391854 More work on Aludel rendering - still one edge case I can't nab 2013-05-13 23:12:03 -04:00
pahimar
fb90f5708c Add support for the new ItemRenderer type 2013-05-13 21:20:53 -04:00
pahimar
d841fbef4f Work on Glass Bell & Aludel interaction :) 2013-05-12 22:08:11 -04:00
pahimar
5ac9f427eb Bump to capture the lighting fixes two commits prior 2013-05-12 20:52:53 -04:00
pahimar
1321474a14 Properly sticking a version for MC 1.5.2 in the repo (pre1g for MC 1.5.1 works fine for MC 1.5.2) 2013-05-12 20:49:40 -04:00
pahimar
435cbc9164 Light update network syncs properly now, and some code style cleanup 2013-05-12 20:30:23 -04:00
pahimar
519f390c2f Merge pull request #362 from PizzAna/master
Updated Finnish localization
2013-05-12 08:43:21 -07:00
PizzAna
92a95b51e9 Revert README.md 2013-05-12 17:34:24 +03:00
PizzAna
db32775fa1 Update README.md 2013-05-12 14:23:38 +03:00
PizzAna
c820e00805 Tweaked Finnish localization and changed one small thing in README.md 2013-05-12 14:14:21 +03:00
pahimar
ec9c871f74 Merge pull request #358 from nickfromgreek/master
Removed EE3 translation
2013-05-10 06:10:32 -07:00
nick tsip
435103a26e changed from Equival Exchange 3 to Equivalent Exchange 3 2013-05-10 15:29:50 -07:00
nick tsip
309d55769c Reverted Equival Exchange 3 translation 2013-05-10 14:33:15 -07:00
pahimar
623bcab5d7 Meh 2013-05-09 16:11:26 -04:00
pahimar
19c453eb1d Merge pull request #357 from nickfromgreek/master
Update to greek localizations
2013-05-09 11:56:26 -07:00
nick tsip
5fc67addbe Updated some localiztions + registered the file 2013-05-09 20:51:33 -07:00
pahimar
30df367f75 Merge pull request #356 from nickfromgreek/master
Greek localization
2013-05-09 10:24:40 -07:00
nick tsip
0be659e720 Added greek localization file 2013-05-09 20:18:06 -07:00
pahimar
ddf859d670 Merge pull request #355 from PizzAna/master
Fixed Finnish localization typos and updated README.md with newer JDK and Ant versions
2013-05-09 07:05:20 -07:00
PizzAna
fedceeae1b Update README.md with 1.5.2 stuff 2013-05-09 17:00:46 +03:00
PizzAna
9c0281a18e Update fi_FI.xml with small language and typo corrections 2013-05-09 11:39:35 +03:00
PizzAna
21fe0e48df Update README.md with newest version of Ant and JDK 2013-05-09 11:33:54 +03:00
pahimar
6c75fe478c Merge pull request #352 from MartijnWoudstra/patch-4
Dutch translation update
2013-05-07 16:33:55 -07:00
MartijnWoudstra
e0e866cc53 Dutch translation update
changed order to match en_US.
Added container.glassBell
2013-05-08 00:15:23 +03:00
pahimar
dbf52792b3 Net sync for item rendering in the Glass Bell. Light levels still not immediately synced though. Working on that. 2013-05-07 15:44:39 -04:00
pahimar
4e5c5ecff1 Merge pull request #350 from felix1801/patch-2
Update fr_FR.xml
2013-05-07 05:59:01 -07:00
pahimar
2f54402320 Merge pull request #351 from crafteverywhere/patch-4
Update zh_CN.xml
2013-05-07 05:58:53 -07:00