Commit graph

784 commits

Author SHA1 Message Date
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
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
Tencha
cf370bd6fb Norwegian language file update
Did the rest of the translations and updated for 1.5.
2013-04-05 20:20:52 +02:00
Tencha
0e5df9cc63 Updated Norwegian language file
Added the necessary(hopefully) entries, and changed some into what I
felt was more correct.
2013-04-05 05:22:16 +02:00
Kehlim
57992890e7 Fixed Mod logo not showing.
I just "slashed" the filepath :)
2013-04-03 20:01:43 +02:00
pahimar
4e65625e96 Enabled the da_DK localization that was submitted a few weeks ago (sorry for the delay!!!) 2013-04-02 21:45:45 -04:00
pahimar
dfed0727ad Cleanup accidentally removed some necessary code (because it wasn't used yet), added back the regex checks to verify that lines are valid. 2013-04-02 21:42:24 -04:00
pahimar
25d863982f Unnecessary classes, and cleaning up formatting a bit in prep for the PR to Forge 2013-04-02 21:17:40 -04:00
pahimar
fedf87c304 Adjust visibility of the parseObj method, add a URL based constructor, modified renderAll for further performance optimizations 2013-04-02 20:29:00 -04:00
pahimar
30a8bdcb94 Goofed up the colours for these two guys 2013-04-02 15:57:47 -04:00
pahimar
9ab2420425 Merge pull request #288 from DarkTrollRises/master
Transformation bug involving metadata
2013-04-02 12:56:28 -07:00
pahimar
e5228cb697 Removing the now unnecessary CustomItemRarity piece 2013-04-02 15:51:27 -04:00
pahimar
bf09bdb8a6 Reduce number of startDrawing/draw calls to the tessellator (thanks for the tip), add some render methods to WavefrontObject, removed unnecessary commenting 2013-04-02 14:38:24 -04:00
pahimar
64f0663e88 Merge pull request #290 from LordOfTheMine/master
Fixed transmutation
2013-03-31 19:12:26 -07:00
LordOfTheMine
e9b8bd5b91 Fixed transmutation recipes involving metadata 2013-04-01 01:04:26 +03:00
pahimar
ea9aa06d44 Working on more OBJ stuff 2013-03-31 15:29:39 -04:00
DarkTrollRises
a40b1a208f Transmutation bug involving metadata fixed 2013-03-31 09:48:55 +02:00
pahimar
2b7bae8d8e Merge pull request #284 from CaptainShadows/master
Transmutation Stone Fix. Should have remembered this when it was buggy the other night :) Thanks CaptainShadows!
2013-03-30 05:22:36 -07:00
Captain of all Shadows
ca7a589f1b Transmutation Fix
Fix for a bug where the transmutation wouldn't work unless the stone was
new
2013-03-30 00:08:04 -04:00
pahimar
3a004a5540 Merge pull request #281 from ChrRaz/master
Crash fix of LivingHandler
2013-03-29 15:02:12 -07:00
ChrRaz
c1557d4b72 Fixed a crash involving kills by arrows
I've fixed a crash, occurring when a mob was shot with a bow, by a player.
2013-03-29 22:59:38 +01:00
pahimar
4c34caceb7 More regex support 2013-03-29 11:34:14 -04:00
pahimar
4fed6ca22d Only calculate normals as many times as needed, add support for specifying the glDrawingMode (if desired) 2013-03-28 00:02:15 -04:00
pahimar
6d332efe0d Updating xcf's to match the proper pngs 2013-03-27 23:36:10 -04:00
pahimar
e80e166ead Merge pull request #276 from WORMSS/master
Reduced amount of computations of Face.getFaceNormal() during a Face.render()
2013-03-27 20:33:18 -07:00
pahimar
a43f99ccad Merge pull request #272 from anonymouspineapple/patch-1
Update ja_JP.xml
2013-03-27 20:22:44 -07:00
pahimar
25dbbec0f1 Merge pull request #277 from AwesomeDane/patch-1
Create da_DK.xml
2013-03-27 20:22:37 -07:00
AwesomeDane
2f4656ecaf Create da_DK.xml
This is my Danish translation of Equivalent Exchange 3.
2013-03-27 19:56:07 +01:00
WORMSS
585ab86566 Reduced amount of computations of Face.getFaceNormal() during a Face.render() 2013-03-27 11:37:34 +00:00
Anonymous Pineapple
d71e37ff8d Update ja_JP.xml
-Getting this thing up-to-date with the new 1.5 localization standards.
-Translations for aludel and alchemical chest.
-Changed version.current and version.outdated to better match English. (Very, very crude; be warned.)
-Most commands and message stuff are missing; will find a Japanese friend of mine (or Minalien) to translate later.
2013-03-24 02:32:32 -03:00
pahimar
83051d7705 Update EE3 to MC 1.5.1, and more work on the OBJ importer (almost done with it!). My first MC update outside of Canada :) 2013-03-21 19:44:21 -04:00
pahimar
bbf22cace7 Finished up writing our own method of parsing WavefrontOBJ model files into a useable object. Proper documentation is still needed, as is some more validation stuff, and the load should throw an exception in the event that it can't load the model properly from file. 2013-03-21 09:55:28 -04:00
pahimar
bde96c32be Fix error in formating of RU localization, and more work on a new parser implementation 2013-03-19 23:36:22 -04:00
pahimar
4eeacc8191 Merge pull request #257 from kol999/master
Updated and fixed Russian translations.
2013-03-19 12:21:28 -07:00
pahimar
4da1c0e455 The start of some comments, and writing my own Wavefront OBJ parser (the one from the lib was needlessly complex) 2013-03-19 15:21:10 -04:00
pahimar
e118cb78a7 Reverting back the version check mechanic I was trying out (different release streams), and some source code cleanup 2013-03-19 12:15:09 -04:00
pahimar
f0ac7a41fc Testing some new Version Check mechanics 2013-03-19 10:42:28 -04:00
pahimar
4cd352c7dc Merge remote-tracking branch 'refs/remotes/origin/master' 2013-03-19 10:41:57 -04:00
pahimar
5bc6c54e83 Testing some new version check functionality (different release types) 2013-03-19 10:38:34 -04:00
pahimar
0eb764a237 Merge pull request #259 from CaptainShadows/master
Updated es_ES.xml
2013-03-19 06:03:02 -07:00
pahimar
6ed5b2150f Merge pull request #260 from crafteverywhere/patch-1
Update zh_CN.xml
2013-03-19 06:02:44 -07:00
pahimar
80007e00d4 Merge pull request #261 from crafteverywhere/patch-3
Update zh_TW.xml
2013-03-19 06:02:34 -07:00
pahimar
bd6700f62e Merge pull request #262 from Cakejoke/master
German localization update
2013-03-19 06:02:23 -07:00
pahimar
373837812c Merge pull request #265 from PizzAna/master
Updated Finnish localization and tweaked some old translates
2013-03-19 06:01:52 -07:00
pahimar
a36373ff33 Merge pull request #267 from N00byEdge/patch-2
Update sv_SE.xml
2013-03-19 06:01:07 -07:00
N00byEdge
7cb9469f6a Update sv_SE.xml
Removed all bag colours, added translation for bags in general.
2013-03-19 08:26:38 +01:00
pahimar
bf864e3f88 Simplify some stuff related to the new OBJ loading 2013-03-18 22:37:03 -04:00