pahimar
|
c7054f92d1
|
Fix Alchemical Chest/Bag gui texture paths
|
2014-02-10 20:20:36 -05:00 |
|
pahimar
|
96b6e1d1e4
|
Merge remote-tracking branch 'origin/master'
Conflicts:
src/main/resources/assets/ee3/textures/gui/alchemicalStorage_large.png
src/main/resources/assets/ee3/textures/gui/alchemicalStorage_medium.png
src/main/resources/assets/ee3/textures/gui/alchemicalStorage_small.png
|
2014-02-10 20:03:18 -05:00 |
|
pahimar
|
ffc5a204f1
|
Updating some broken bag code
|
2014-02-10 20:02:38 -05:00 |
|
pahimar
|
10378cfaec
|
Fixes the missed texture renames (for the alchemical chest guis)
|
2014-02-05 14:37:45 -05:00 |
|
pahimar
|
75f12767d9
|
Fixes #617 and #618
|
2014-02-05 14:20:42 -05:00 |
|
pahimar
|
ab288a587d
|
Added subtypes to Alchemical Bags, played with the texture a bit to visually distinguish the different types better (omg texture artists please help me)
|
2014-02-01 21:23:47 -05:00 |
|
pahimar
|
eed4a7bdaa
|
Work on getting the Aludel working - to be continued on my desktop
|
2014-01-19 11:18:16 -05:00 |
|
pahimar
|
58bd0a1dca
|
Just cleaning up some stuff
|
2014-01-12 12:42:41 -05:00 |
|
pahimar
|
f16ff69042
|
Fixes #570
|
2014-01-12 12:40:30 -05:00 |
|
pahimar
|
ca38bdde89
|
Fix the Calcinators gui name
|
2014-01-12 12:35:58 -05:00 |
|
pahimar
|
cea970194e
|
Short of a light update bug, I think the Calcinator is done!
|
2014-01-12 10:51:26 -05:00 |
|
pahimar
|
b07d70a84e
|
Active calcinator texture
|
2014-01-11 18:42:40 -05:00 |
|
pahimar
|
a328988b28
|
Calcinator network work
|
2014-01-10 23:54:39 -05:00 |
|
pahimar
|
700275da34
|
The great localization purge of 2014
|
2014-01-06 18:51:57 -05:00 |
|
pahimar
|
146dc0a1de
|
Just some more Alchemical Chest stuff :)
|
2014-01-05 22:22:59 -05:00 |
|
pahimar
|
f8237d6c89
|
More Alchemical Chest/Inventory stuff
|
2014-01-05 12:16:48 -05:00 |
|
pahimar
|
be86ee89af
|
The different sized Alchemical Chests aren't quite working yet, but loads of GUI work and textures and stuff tonight
|
2014-01-04 23:02:06 -05:00 |
|
pahimar
|
081730ad4b
|
Lots more experimental changes :)
|
2014-01-04 18:38:42 -05:00 |
|
pahimar
|
2ad08cbdc5
|
Some very experimental stuff with "infused" blocks
|
2014-01-04 12:53:23 -05:00 |
|
pahimar
|
49e7bb97d8
|
Adding some preliminary work on the Research Station
|
2014-01-02 22:48:09 -05:00 |
|
pahimar
|
ea3fcd11b7
|
Merge pull request #552 from JohnSmith114/master
Corrected some errors and finished the Version check localizations on it_IT.lang
|
2014-01-02 12:51:47 -08:00 |
|
pahimar
|
76ab773b57
|
Merge pull request #551 from VeryBigBro/patch-3
Update ru_RU.lang
|
2014-01-02 12:51:42 -08:00 |
|
pahimar
|
a55b3ff091
|
Merge pull request #549 from Leon1236/patch-2
Create hr_HR.lang
|
2014-01-02 12:51:37 -08:00 |
|
JohnSmith114
|
2bb065bf65
|
Corrected some errors and finished the Version check localizations
|
2014-01-02 21:34:46 +01:00 |
|
Anton
|
c74b4c6619
|
Update ru_RU.lang
|
2014-01-02 14:35:03 +03:00 |
|
pahimar
|
df8aa8e7d9
|
Localization stuffs
|
2014-01-02 02:35:25 -05:00 |
|
pahimar
|
b6094df8c6
|
Changing around some textures
|
2014-01-02 02:25:56 -05:00 |
|
pahimar
|
2b66e13ff2
|
Just some stuff
|
2014-01-02 01:00:00 -05:00 |
|
Leon1236
|
b92ea5741d
|
Create hr_HR.lang
Added Croatian translation by Leon1236
|
2014-01-01 20:35:14 +01:00 |
|
pahimar
|
dc6fe0576a
|
Merge pull request #530 from Vexatos/patch-1
Updated de_DE.lang
|
2013-12-30 21:08:42 -08:00 |
|
pahimar
|
3909894172
|
Merge pull request #539 from VeryBigBro/patch-2
Update ru_RU.lang
|
2013-12-30 21:08:34 -08:00 |
|
pahimar
|
926942131b
|
Merge pull request #544 from Asajz/patch-1
Update es_ES.lang
|
2013-12-30 21:08:25 -08:00 |
|
pahimar
|
c6de187b69
|
Merge pull request #531 from crafteverywhere/patch-6
Update zh_CN.lang
|
2013-12-30 21:08:16 -08:00 |
|
pahimar
|
3039c2d71d
|
Some preliminary work on transmutation squares
|
2013-12-30 21:41:10 -05:00 |
|
pahimar
|
3ae4e5d2ba
|
Other than some display related stuff, the Calcinator is pretty much "done"
|
2013-12-30 17:53:28 -05:00 |
|
Asajz
|
442dca2a68
|
Update es_ES.lang
A few minor changes to fix grammar.
|
2013-12-28 22:59:04 -06:00 |
|
Anton
|
8063a00141
|
Update ru_RU.lang
|
2013-12-28 16:29:17 +03:00 |
|
Vexatos
|
e8c5285b37
|
Resorting and stuff
|
2013-12-28 13:09:13 +01:00 |
|
pahimar
|
371541a07a
|
Re-jigged the alchemical fuels to conserve block/item ids
|
2013-12-28 00:08:13 -05:00 |
|
pahimar
|
65d71da66d
|
Added Alchemical Coal, Mobius Fuel, and Aeternalis Fuel. EmcValues and crafting methods for them still to come
|
2013-12-27 19:54:31 -05:00 |
|
pahimar
|
1bcfc551be
|
And now for the XCFs
|
2013-12-26 11:18:53 -05:00 |
|
pahimar
|
7ac6988b6f
|
Forgot to commit the textures
|
2013-12-26 11:18:00 -05:00 |
|
Vexatos
|
a02b7c9cd9
|
I know it's Latin. That's why I don't translate it
|
2013-12-26 09:30:45 +01:00 |
|
pahimar
|
aad4435415
|
Just a few items you might know of from before
|
2013-12-25 08:50:07 -05:00 |
|
crafteverywhere
|
8ab9d28470
|
Update zh_CN.lang
|
2013-12-24 21:42:07 +08:00 |
|
Vexatos
|
49c3503417
|
Update de_DE.lang
|
2013-12-24 14:22:09 +01:00 |
|
pahimar
|
60423c1421
|
Calcinators now produce dust
|
2013-12-23 22:13:57 -05:00 |
|
pahimar
|
f0b08b431f
|
Cleaning
|
2013-12-20 06:58:15 -05:00 |
|
Evelyne Lachance
|
3f439c38a3
|
Added French localisation
|
2013-12-14 21:48:24 -05:00 |
|
AbrarSyed
|
51b756e17a
|
Step 3: The Rebirth
|
2013-12-13 03:45:03 -06:00 |
|