Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
745 commits 1 branch 0 tags 11 MiB
Commit graph

745 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
pahimar
870fa5eebc Merge pull request #107 from LuzanelL/master 
Chinese(Simplified and Traditional ) Localization Update
 2012-12-10 06:38:55 -08:00
pahimar
fbd02713a9 Merge pull request #108 from Colonel-Rogue/master 
Latin localization Update
 2012-12-10 06:38:38 -08:00
TJ
d4603139b8 Latin Localization Update 2012-12-09 22:35:44 -08:00
Lure
88395b35a1 Merge pull request #11 from anonymouspineapple/patch-12 
Updated Traditional Chinese localization
 2012-12-09 17:28:45 -08:00
Lure
75bc6d5b3c Merge pull request #10 from anonymouspineapple/patch-11 
Updated Chinese calcinators
 2012-12-09 17:28:34 -08:00
Adam
f7cf338601 Updated Traditional Chinese localization 
To match the simplified changes.
 2012-12-09 20:26:53 -05:00
Adam
feb8b7eeea Updated Chinese calcinators 
Better translation, as well as reordering to match English one.
 2012-12-09 20:25:08 -05:00
André Carvalho
9733511e80 Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git 2012-12-09 17:56:23 +00:00
pahimar
4d7d01011c First steps on allowing the stone overlay to be in different corners of the screen 2012-12-07 16:00:45 -05:00
pahimar
64ea3efbba Some cleaning up of rendering code, fix the missing overlay face problem 2012-12-07 12:42:04 -05:00
pahimar
fb689d0697 Commiting what I have at home so I can work on it later today 2012-12-07 07:11:57 -05:00
André Carvalho
275fbf5288 Long overdue update to the pt_PT translation 
Sorry for the delay.
The translation file has been updated to reflect upstream changes.
 2012-12-07 11:44:51 +00:00
André Carvalho
36eb54a4b9 Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3 2012-12-07 11:27:19 +00:00
remuladgryta
b905c60250 Updated Swedish localization 2012-12-07 10:05:25 +01:00
pahimar
ae14f68167 More WorldEvent work 2012-12-06 21:06:16 -05:00
pahimar
69293538b9 More work on WorldEvent packets (the way clients will request servers to do world modification events). Decided to go with a general packet with event types 2012-12-06 16:04:20 -05:00
pahimar
f5dcb31ace Merge pull request #103 from LuzanelL/master 
Removed duplicate Red Water entries in Portuguese(BR) Localization
 2012-12-05 20:16:58 -08:00
pahimar
a5127a6a13 More work on a packet for in world events 2012-12-05 23:15:36 -05:00
Lure
5a87f5e0bc Merge pull request #9 from anonymouspineapple/patch-10 
Removed duplicate Red Water entries
 2012-12-05 15:07:53 -08:00
Adam
0d7199ccd4 Removed duplicate Red Water entries 2012-12-05 18:04:06 -05:00
pahimar
02e9bb09da Beginning work on world transmutation packets 2012-12-05 16:06:50 -05:00
pahimar
8b059dfd0c Some rework on configs (where they are stored/etc) 2012-12-05 14:33:03 -05:00
pahimar
d95ab7473a Merge remote-tracking branch 'origin/master' 2012-12-04 16:12:37 -05:00
pahimar
bb07edc77c Nothing to see here 2012-12-04 16:11:54 -05:00
pahimar
07bf65d669 Merge pull request #99 from 50Wliu/README_updates 
Readme Updates
 2012-12-04 07:43:59 -08:00
pahimar
3e708574d7 Merge pull request #101 from LuzanelL/master 
Updated formatting for Czech localization file
 2012-12-04 07:43:50 -08:00
pahimar
ae22cf0e1b Merge pull request #102 from dionrhys/welsh-localisation 
Updated Welsh localisation with alchemical bag names and revised version...
 2012-12-04 07:43:14 -08:00