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 |
|
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 |
|
pahimar
|
76dde33ae1
|
Some work on the rendering of the Glass Bell
|
2013-04-25 22:54:37 -04:00 |
|
addobandre
|
1a20c99e25
|
Update pt_PT.xml
Made a little typing mistake here... Fixed
|
2013-04-25 23:48:51 +02:00 |
|
addobandre
|
57da180ec1
|
Update pt_PT.xml
Fixed minor issues. -> Some words just don't have a translation to Portuguese... Others are just used incorrectly(eg.:Alquímico/Alquémico).
|
2013-04-25 23:43:05 +02:00 |
|
pahimar
|
a61b5d4559
|
Merge pull request #327 from Tencha/master
Update nb_NO.xml
|
2013-04-24 06:01:24 -07:00 |
|
Tencha
|
ccb3244f78
|
Update nb_NO.xml
Added translation for glass bell and fixed typo.
|
2013-04-22 23:51:00 +02:00 |
|
pahimar
|
58026b474a
|
Merge pull request #326 from OSDemirci/master
TR_tr Lang File Update
|
2013-04-22 03:28:07 -07:00 |
|
pahimar
|
5f810077e3
|
Merge pull request #325 from MartijnWoudstra/patch-2
Dutch translation update
|
2013-04-22 03:27:55 -07:00 |
|
OSDemirci
|
02b212718b
|
Minor Change
Newline deleted
|
2013-04-22 10:22:32 +03:00 |
|
MartijnWoudstra
|
8127192c8e
|
Dutch translation update
Added glass bell
|
2013-04-22 08:22:20 +03:00 |
|
pahimar
|
daee935cf7
|
Merge pull request #324 from OSDemirci/master
Language File Changes
|
2013-04-21 18:56:42 -07:00 |
|
OSDemirci
|
5853fbe0dc
|
L10n Update(TR_tr)
|
2013-04-22 03:24:40 +03:00 |
|
pahimar
|
b150db190d
|
Merge pull request #322 from MartijnWoudstra/patch-1
Dutch translation update
|
2013-04-21 13:30:52 -07:00 |
|
pahimar
|
0172c22e4f
|
Merge pull request #316 from Kehlim/master
German translation update
|
2013-04-21 13:30:24 -07:00 |
|
MartijnWoudstra
|
6c9cd25701
|
Dutch translation update
set_to_all and set_to_self were the same. Translation updated
|
2013-04-21 22:17:45 +03:00 |
|
Kehlim
|
ebf810dca7
|
Updating german translation and correction
|
2013-04-20 14:22:05 +02:00 |
|
pahimar
|
7e28edec83
|
Merge pull request #315 from Robotic-Brain/master
Renamed all references to "alchemicalDust"
|
2013-04-20 03:56:06 -07:00 |
|
Robotic-Brain
|
2e4d651ff9
|
Renamed all references to alchemicalDust
|
2013-04-20 11:52:08 +02:00 |
|
Robotic-Brain
|
d468e6b2f8
|
Revert dustAlcemical String change
(Produced Missing Texture Bug)
|
2013-04-20 11:30:32 +02:00 |
|
Robotic-Brain
|
9eeaa9cbac
|
Revert dustAlcemical String change
(Produced Missing Texture Bug)
|
2013-04-20 11:28:16 +02:00 |
|
Robotic-Brain
|
1bf5bd3a0e
|
Merge remote-tracking branch 'origin/master' into local
|
2013-04-20 11:20:24 +02:00 |
|
pahimar
|
390a637b89
|
It's amazing how much you have to change when you want to rename something :-p
|
2013-04-19 11:34:45 -04:00 |
|
pahimar
|
d5bc8d927b
|
Exclude XCF files from the jar file when building. Fixes Issue 313.
|
2013-04-18 18:48:21 -04:00 |
|
pahimar
|
4bb5278d4d
|
Moving back, and correcting some things in the build file
|
2013-04-18 16:14:58 -04:00 |
|
pahimar
|
9b3426e088
|
Moving
|
2013-04-18 15:48:14 -04:00 |
|
pahimar
|
ab60c1c28f
|
More work on making the items in the Glass Dome render "better," still more to do. Also stripped out owner from TileEE data since we don't have a use for it right now.
|
2013-04-17 00:02:48 -04:00 |
|
pahimar
|
a057b88c3d
|
Working on a new block, the Glass Dome
|
2013-04-16 16:06:30 -04:00 |
|
pahimar
|
1b6cbd7da0
|
Merge pull request #305 from telinc1/master
Made the hitbox of the Alchemical Chest smaller so it fits the model.
|
2013-04-16 09:37:30 -07:00 |
|
pahimar
|
acec32c146
|
Merge pull request #300 from WORMSS/patch-1
Changed to getUnlocalizedName2
|
2013-04-16 09:35:08 -07:00 |
|
Robotic-Brain
|
b72b4cdd7b
|
Added Mac specific .gitignore
|
2013-04-16 06:52:34 +02:00 |
|
pahimar
|
19a6882eec
|
Merge pull request #306 from jeffreykog/master
Updated dutch localization files
|
2013-04-13 05:53:44 -07:00 |
|
Jeffrey Kog
|
7eb4d22d8c
|
Removed the newline (now for real)
|
2013-04-13 13:55:57 +02:00 |
|
Jeffrey Kog
|
8cc5f8f967
|
Deleted newline at the end of the file
|
2013-04-13 14:49:23 +03:00 |
|
Jeffrey Kog
|
9cbf72afdf
|
Updated dutch localization file
|
2013-04-13 14:23:22 +03:00 |
|
Telinc1
|
ee82ac2528
|
Changed the bounding box of the Alchemical Chest.
|
2013-04-13 13:08:38 +03:00 |
|
pahimar
|
ced91d5bf2
|
Added in support for auto-incrementing build numbers into the build script (and code). A nicer way to track what version folks have :)
|
2013-04-12 13:01:37 -04:00 |
|
pahimar
|
dad38a11a3
|
Merge pull request #303 from TehSomeLuigi/master
Ant Buildfile, Specific OS should be replaced with OS Family
|
2013-04-12 07:28:54 -07:00 |
|
TehSomeLuigi
|
977afb4a15
|
Replaced "Windows 7"/"Windows 8" with "windows" osfamily for Windows versions other than 7/8 and replace "Linux"/"Mac OS X" with "unix" osfamily for Unix OSes that aren't Linux/Mac.
|
2013-04-12 15:18:24 +01:00 |
|
pahimar
|
c7b397e74d
|
Merge pull request #302 from 50Wliu/Localization
Localization Updates
|
2013-04-11 17:32:41 -07:00 |
|
Wliu
|
24eaf5c941
|
OCD Localization update
Format is now Language (abbreviation) Localization File.
Got rid of newlines-currently, a localization file is up-to-date if it
contains 52 lines.
|
2013-04-11 20:09:34 -04:00 |
|