Commit graph

1572 commits

Author SHA1 Message Date
Wliu
fb0e98000d Revert "Update .gitignore"
This reverts commit 05124df9b8.
2012-12-20 19:29:02 -05:00
Wliu
9703f6d561 Revert "Add back updates.txt"
This reverts commit 6a151cc702.
2012-12-20 19:29:01 -05:00
pahimar
f39a8f02d0 Merge pull request #126 from anonymouspineapple/patch-17
Updated Italian Alchemy Bag capitalization + colors
2012-12-20 16:27:21 -08:00
Adam
0806bb9ec3 Updated Alchemy Bag capitalization + colors
Capitalized everything for consistency, changed colors to match those used in the vanilla game, and fixed a typo (Irridiscente) found by my Italian-speaking friend.
2012-12-20 19:25:05 -05:00
pahimar
6bc714a704 Transmutation target block overlay (the spinny thing) can now be placed in any of the four corners of the screen, and the beginnings of a /ee3 command system 2012-12-20 16:45:50 -05:00
Wliu
05124df9b8 Update .gitignore
More later probably.
2012-12-19 22:04:11 -05:00
Wliu
6a151cc702 Add back updates.txt
Hate you Git
2012-12-19 19:02:33 -08:00
pahimar
46d95ca362 Some tweaks, some fixes, some removals of redundancies 2012-12-19 16:56:49 -05:00
pahimar
a1e45baf45 Derped and left unnecessary sysouts, added the named version of registerBlock 2012-12-19 13:49:39 -05:00
pahimar
95bd72e0d8 Successful transmutation events properly play sounds/particles on the client now 2012-12-19 13:47:45 -05:00
pahimar
38b2efa70c Clean up unused imports and some formatting 2012-12-19 13:09:56 -05:00
pahimar
c6a5774867 Multiblock in world transmutation almost done 2012-12-18 21:57:38 -05:00
pahimar
21020bce90 Some more control for the user to say what they want a block to transmute into 2012-12-18 17:06:00 -05:00
pahimar
487fc17d19 Bump the version number, add some NPE protection to the version checker 2012-12-18 13:13:20 -05:00
pahimar
112b74dd30 Generalize more of the events, add the ability to have events fire before/after the action proposed 2012-12-18 13:05:04 -05:00
pahimar
d6aca678d5 Update to MC 1.4.6 2012-12-18 08:41:49 -05:00
pahimar
ac43b84302 Merge pull request #123 from pupaxxo/patch-2
Update resources/ee3/lang/it_IT.xml
2012-12-18 05:16:49 -08:00
André Carvalho
d5b25d9cc9 Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git 2012-12-18 13:02:47 +00:00
Andrea Ruggiero
efd7bc70d1 Update resources/ee3/lang/it_IT.xml 2012-12-18 14:00:58 +01:00
pahimar
35b83ceafd Merge pull request #122 from LuzanelL/master
Chinese(Simplified) Localization Update
2012-12-17 13:46:43 -08:00
pahimar
24ab86083f Some abstractions/etc related to action events and request events 2012-12-17 16:38:56 -05:00
Lure
720b2136d1 Merge pull request #16 from anonymouspineapple/patch-16
Better "extra" translation for Traditional Chinese
2012-12-17 13:16:55 -08:00
Lure
95d9898678 Merge pull request #17 from pahimar/master
Updating repo
2012-12-17 13:16:38 -08:00
pahimar
8a4c898aa0 Fixed the build script to handle the repackaging, and Windows 8 support 2012-12-17 16:00:04 -05:00
pahimar
e03797f1ca Repackaging EE3 packages/classes to better match up with the MC repackaging 2012-12-17 15:21:53 -05:00
André Carvalho
2d9caff1db Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git 2012-12-17 12:18:55 +00:00
Adam
70f72600d6 Better "extra" translation for Traditional Chinese 2012-12-16 19:00:29 -05:00
pahimar
7e774b07be Merge pull request #116 from pupaxxo/patch-1
Update resources/ee3/lang/it_IT.xml
2012-12-15 16:35:41 -08:00
André Carvalho
980b7bbc28 Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git 2012-12-15 00:45:33 +00:00
Andrea Ruggiero
3fb39a911e Update resources/ee3/lang/it_IT.xml 2012-12-14 21:15:55 +01:00
pahimar
a5a8f32683 Merge pull request #113 from Cakejoke/master
German localization update
2012-12-14 09:30:18 -08:00
André Carvalho
04be6c03ee Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git 2012-12-14 17:29:59 +00:00
pahimar
7a311262c6 Merge pull request #114 from LuzanelL/master
Chinese(Simplified and Traditional ) Localization Update
2012-12-14 09:29:11 -08:00
pahimar
c4b5dc24e2 Merge pull request #115 from iggythemad/patch-1
Update resources/ee3/lang/pl_PL.xml
2012-12-14 09:28:35 -08:00
iggythemad
9630571357 Update resources/ee3/lang/pl_PL.xml
Revised and updated for the new entries.
2012-12-14 11:18:30 +00:00
Lure
83cf510248 Merge pull request #12 from anonymouspineapple/patch-13
Chinese localization update
2012-12-13 15:16:36 -08:00
Lure
92c3c1475a Merge pull request #13 from anonymouspineapple/patch-14
Updated Traditional Chinese localization
2012-12-13 15:16:03 -08:00
Lure
87d93fef19 Merge pull request #14 from pahimar/master
Updating repo
2012-12-13 15:15:48 -08:00
Cakejoke
c18009af2e Update german localization 2012-12-13 18:11:51 +01:00
pahimar
45a2c97c81 Merge pull request #110 from laz2727/master
JAFU
2012-12-13 07:05:57 -08:00
pahimar
257ab2144b Fix imports for the new FML/MinecraftForge repackaging 2012-12-13 10:01:41 -05:00
pahimar
c078794880 Beginnings of a proper hook for world protection. Client intiates a request to the server. Server validates if the request is going to be allowed (via an event). If the event is not canceled, then the server allows the action to occur. 2012-12-12 22:41:40 -05:00
Adam
4153f76464 Traditional Chinese update 2012-12-12 22:36:31 -05:00
Adam
00753aa99e "Extra" translation for Chinese 2012-12-12 22:34:45 -05:00
André Carvalho
e27eb0f80e Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git 2012-12-11 23:51:06 +00:00
pahimar
9ece2719de Fixed some formatting derps 2012-12-11 11:29:49 -05:00
André Carvalho
c393784a5b Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git 2012-12-10 16:53:20 +00:00
ΛAZ27
77189cffb9 JAFU 2012-12-10 22:16:44 +06:00
pahimar
e11c48abfb Merge pull request #104 from remuladgryta/master
Updated Swedish localization
2012-12-10 06:39:37 -08:00
pahimar
b608563114 Merge pull request #105 from RedRoserade/master
Updated European Portuguese translation file
2012-12-10 06:39:15 -08:00