Commit graph

1329 commits

Author SHA1 Message Date
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
Wliu
e9c8455799 Updated remaining localizations to 1.5
cy_GB; fr_FR; it_IT; la_IT; la_IT; nl_NL; pl+PL; pt_BR; sk_SK; sr_RS;
sv_SE; zh_CN; zh_TW.
This time, my changes to the files weren't the same-I was in a hurry.
Might have missed some.
2013-04-11 20:07:54 -04:00
Wliu
3c6088420b Updated README.md for 1.5.x
Tada!  Here it is!  :)
2013-04-11 19:20:25 -04:00
pahimar
cdd3a74c15 Merge pull request #301 from 50Wliu/README
Updated README.md
2013-04-11 15:54:28 -07:00
Wliu
f46acc8ab9 Updated README.md for 1.5.x
Tada!  Here it is!  :)
2013-04-11 18:03:26 -04:00
WORMSS
87ee823acb Changed to getUnlocalizedName2
Changed to getUnlocalizedName2 to remove the need to use substring and index of.
2013-04-11 14:11:46 +02:00
pahimar
75dfff2dba Bumping official version 2013-04-10 21:45:10 -04:00
pahimar
fea6200564 Removing my Wavefront Object loader now that it is working properly in Forge 650+
Modifying model classes to use the new Forge model loader
Set a dependency that EE3 requires Forge 650 and higher
Cleaning up source code/formatting
2013-04-10 21:04:31 -04:00
pahimar
3c93e6a62f More modelling stuff 2013-04-10 16:27:25 -04:00
pahimar
7c62c0d603 More modelling stuff 2013-04-10 16:17:46 -04:00
pahimar
6800687dd9 Some fixes to WavefrontObject, and adding in a simple interface for custom models to implement 2013-04-10 15:52:09 -04:00
pahimar
522cd16da9 Some documentation, but I think the code is pretty straightforward 2013-04-09 14:59:38 -04:00
pahimar
854efb0909 Revert mod name back to uppercase, synch up localization file names, add "w" support for vertices, and add in proper exceptions to the parsing of Wavefront Object files 2013-04-09 14:43:19 -04:00
pahimar
600654146f Merge pull request #298 from Tencha/master
Renamed no_NO to nb_NO
2013-04-09 11:27:31 -07:00
pahimar
4f28a0ea03 Merge pull request #299 from majsky/master
Slovak localization
2013-04-09 05:01:20 -07:00
majsky
5a0c0c7720 Various fixes 2013-04-09 06:42:41 +02:00
pahimar
03d75f03bf Fixed a hardcoded path separator to be more OS independent. 2013-04-08 22:25:29 -04:00
pahimar
e95fb5615c Added in exceptions 2013-04-08 15:42:38 -04:00
majsky
effe340ffa Fied misspell 2013-04-08 14:55:58 +02:00
Live session user
61d4c19a73 add slovak lanuage file 2013-04-08 12:51:36 +00:00
pahimar
bfec19364b Fingerprint check occurs prior to localizations being loaded in, so we cannot localize this text. 2013-04-07 21:52:25 -04:00
pahimar
e89109513d EE3 jars are now signed for authenticity, and just log a warning message if the jar is modified. EE3 also now uses srg names for reobf, meaning EE3 should now not require updates if there are minor MC changes. 2013-04-07 20:29:57 -04:00
pahimar
7946024766 Merge pull request #297 from Lapiman/patch-2
Update da_DK.xml
2013-04-06 17:35:29 -07:00
Tencha
9836d05903 Renamed no_NO to nb_NO
Renamed language code no_NO to the more correct nb_NO and did some
nitpicking in the translations.
2013-04-06 15:03:52 +02:00
Lapiman
26e67b5f81 Update da_DK.xml
Looks like @AwesomeDane forgot to change the title.
2013-04-06 08:53:59 -03:00
pahimar
867d5de9c3 Merge pull request #294 from Kehlim/master
Fixed Mod logo not showing
2013-04-05 11:50:22 -07:00
pahimar
2eb029ba9a Merge pull request #296 from Tencha/master
Norwegian language file update
2013-04-05 11:31:09 -07:00