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 |
|
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 |
|
pahimar
|
9ece2719de
|
Fixed some formatting derps
|
2012-12-11 11:29:49 -05: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 |
|
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 |
|
Dion Williams
|
9753091d29
|
Updated Welsh localisation with alchemical bag names and revised version checker messages
|
2012-12-04 15:16:14 +00:00 |
|
Lure
|
7525daaf02
|
Merge pull request #8 from anonymouspineapple/patch-9
Updated Czech localization file formatting
|
2012-12-03 17:34:07 -08:00 |
|
Adam
|
44f951b924
|
Updated formatting for Czech localization file
Reordered terms to match the rest of the files, for consistency's sake.
|
2012-12-03 18:42:32 -05:00 |
|
pahimar
|
b373c6fa27
|
Merge pull request #96 from LuzanelL/master
Localization update, thanks guys!
|
2012-12-03 05:47:20 -08:00 |
|
Lure
|
b1473dfe35
|
Merge pull request #7 from anonymouspineapple/patch-8
Japanese alchemy bags
|
2012-12-02 19:27:57 -08:00 |
|
Adam
|
9624b1067a
|
Japanese alchemy bags
In this context the term 奇術 to mean "alchemical" is a tad more logical than 錬金術 IMO.
|
2012-12-02 21:17:10 -05:00 |
|
Wliu
|
b4d895a1b9
|
Update README.md
Small changes.
|
2012-12-02 19:58:06 -05:00 |
|
Wliu
|
9104e4d432
|
Update README.md
Added Github for Mac changes everywhere, typo fixes, stuff.
|
2012-12-02 19:50:35 -05:00 |
|
Lure
|
66534f127d
|
Merge pull request #6 from anonymouspineapple/patch-7
Spanish alchemy bags
|
2012-12-02 15:45:51 -08:00 |
|
Adam
|
b106fed3ba
|
Spanish alchemy bags
|
2012-12-02 17:54:22 -05:00 |
|
Lure
|
b03d9f615f
|
pt_BR Localization Update
Updated pt_BR localization to match current english localization
|
2012-12-02 20:39:46 -02:00 |
|
Lure
|
d4f37bdc56
|
Revert "Localization Update"
This reverts commit 88600bc9d9.
|
2012-12-02 20:37:23 -02:00 |
|
Lure
|
38a1196d9e
|
Merge pull request #4 from anonymouspineapple/patch-5
Patch 5
|
2012-12-02 14:28:09 -08:00 |
|
Lure
|
a41c4dd883
|
Merge pull request #5 from anonymouspineapple/patch-6
Patch 6
|
2012-12-02 14:27:50 -08:00 |
|
Adam
|
f581ed5880
|
Updated traditional Chinese translation
Same thing as the simplified update, except traditional.
|
2012-12-02 17:25:10 -05:00 |
|