Commit graph

1209 commits

Author SHA1 Message Date
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
crafteverywhere
ede1f85cb7 Update zh_CN.xml 2013-05-07 13:19:31 +08:00
felix1801
c50656ef05 Update fr_FR.xml 2013-05-06 17:30:53 +03:00
pahimar
0173ebcd0d Merge pull request #349 from felix1801/patch-1
Update fr_FR.xml
2013-05-06 05:52:38 -07:00
felix1801
0fa6820fa9 Update fr_FR.xml
In french, toggle is not "Baculer" but "Basculer"
2013-05-06 13:52:07 +03:00
pahimar
cde484b44c Fix a derp in the sr_RS locale file 2013-05-03 13:38:15 -04:00
pahimar
4b64ffc4f7 Renaming the Aludel block to Aludel Base 2013-05-02 21:16:10 -04:00
pahimar
15365266b6 Merge pull request #344 from PizzAna/master
Updated Finnish localization with Glass Bell and fixed some old derps
2013-04-29 08:02:39 -07:00
PizzAna
3a224ba65a Fixed my derps in old localization PR and added localizations for Glass Bell 2013-04-29 17:45:31 +03:00
pahimar
e433958312 Merge pull request #328 from kol999/master
Russian translations update.
2013-04-29 06:16:50 -07:00
pahimar
9f7e5db434 Merge pull request #329 from Zmiko/master
Serbian translations update.
2013-04-29 06:15:52 -07:00
pahimar
94c1d8e375 Merge pull request #330 from MartijnWoudstra/patch-3
Dutch translation update
2013-04-29 06:15:41 -07:00
pahimar
fe86b3fc10 Merge pull request #333 from CaptainShadows/patch-1
Update es_ES.xml
2013-04-29 06:10:41 -07:00
pahimar
3aedc4c5b7 Merge pull request #334 from lluixhi/master
de_DE changes
2013-04-29 06:10:04 -07:00
pahimar
370dfee515 Merge pull request #336 from addobandre/master
Translation pt_PT.xml
2013-04-29 06:09:39 -07:00
pahimar
b27bc0983b Merge pull request #337 from Lapiman/patch-3
Glass bell- Simplified Chinese
2013-04-29 06:09:17 -07:00
pahimar
d1684b5641 Merge pull request #338 from Lapiman/patch-4
Glass bell- Traditional Chinese
2013-04-29 06:09:08 -07:00
pahimar
01235d1be1 Merge pull request #339 from Lapiman/patch-5
Glass bell- Japanese
2013-04-29 06:07:29 -07:00
Lluixhi
0adee541d2 Fixed some things based on Kehlim's recommendations 2013-04-28 13:53:27 -07:00
pahimar
b7bac517c2 Add crafting recipe for the Glass Bell, and remove an old debug print statement 2013-04-27 13:17:25 -04:00
pahimar
a1de8c660f Transmutation overly no longer will render when the game is paused or the GUI turned off (nice screenshots possible again :) ) 2013-04-27 12:34:23 -04:00
pahimar
451c2d6e8d Items rendered inside the Glass Bell should appear in the correct location now (Glass Bell is still buggy however) 2013-04-27 12:15:14 -04:00
pahimar
3d32a63475 More work on Glass Bell rendering (now will mount to walls and ceilings, and will emit light based on the item in it's inventory). Still buggy and incomplete. 2013-04-27 00:31:27 -04:00
Lapiman
214ddfdd2e Glass bell- Japanese
Japanese is depressingly lacking, but might as well keep it up to date.
2013-04-26 21:20:11 -03:00
Lapiman
5048e97a84 Glass bell- Traditional Chinese 2013-04-26 21:18:21 -03:00
Lapiman
78ed0ec05d Glass bell- Simplified Chinese 2013-04-26 21:16:36 -03:00