André Carvalho
ad00195498
Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git
2012-12-29 00:43:27 +00:00
pksiazek
4c61868b08
Fixed RedPowerWorld FQDN
2012-12-28 09:41:41 +01:00
pahimar
9b1e9d92c6
Merge pull request #137 from 50Wliu/README
...
Update README.md
2012-12-27 19:48:22 -08:00
pahimar
46b79350c3
Merge pull request #138 from Colonel-Rogue/patch-1
...
Update resources/com/pahimar/ee3/lang/la_IT.xml
2012-12-27 19:48:08 -08:00
Colonel Rogue
dd7f523791
Update resources/com/pahimar/ee3/lang/la_IT.xml
...
Modified standalone infinitives to imperatives
2012-12-25 21:09:10 -08:00
Wliu
7fe53d0383
Update README.md
...
Fix derp, forgot to mention that I updated to pre1e.
Enters are still messed up, I give up.
2012-12-25 19:47:25 -05:00
Wliu
071c0c3a69
Update README.md
...
Update forge version again, warning message not to make any build.xml PRs, updated for Win8.
2012-12-25 19:44:36 -05:00
pahimar
606c968d20
Merge pull request #133 from anonymouspineapple/patch-19
...
Removal of duplicate entries
2012-12-24 13:38:34 -08:00
pahimar
3dc7af889b
Merge pull request #132 from anonymouspineapple/patch-18
...
Updated Red Water translations
2012-12-24 13:38:16 -08:00
pahimar
6c8551277e
Merge pull request #134 from anonymouspineapple/patch-20
...
Removed impure / pure
2012-12-24 13:38:00 -08:00
pahimar
11f31c422d
Merge pull request #135 from anonymouspineapple/patch-21
...
Removal of Latin impure / pure
2012-12-24 13:37:54 -08:00
pahimar
f8a0bb399b
Bumping the version to co-incide with the DW pack
2012-12-24 09:50:24 -05:00
André Carvalho
06e63ff857
Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git
2012-12-24 11:48:04 +00:00
Adam
2c30734d29
Removal of Latin impure / pure
2012-12-23 22:23:44 -05:00
Adam
19f13dfa99
Removed impure / pure
2012-12-23 22:23:01 -05:00
Adam
1f77317d8a
Removal of duplicate entries
2012-12-23 22:18:59 -05:00
Adam
47e27da3ec
Updated Red Water translations
...
Parentheses for consistency's sake and capitalization too.
2012-12-23 22:06:05 -05:00
pahimar
aee18dfa79
Discovered that in world transmutation isn't exactly great, have to come up with a good resolution
2012-12-21 14:01:23 -05:00
pahimar
e50d589945
Merge remote-tracking branch 'origin/master'
2012-12-21 13:05:00 -05:00
pahimar
c80e797957
Some hackey work on world transmutation. Need a more intelligent way of handling metadata on in world transmutation
2012-12-21 13:04:48 -05:00
pahimar
b08e41a84d
Merge pull request #128 from 50Wliu/README
...
Update README.md
2012-12-21 08:36:02 -08:00
pahimar
30ae7db6c0
Cleaning up some command stuff before more work
2012-12-21 10:44:15 -05:00
pahimar
754bd0bf48
Some more command stuff, and re-organizing the resources to fit the new package structure
2012-12-21 10:25:18 -05:00
pahimar
96d635e727
More command stuff
2012-12-20 21:31:59 -05:00
Wliu
d48b11e678
Update README.md
...
Last commit, for real. Forgot to update Forge version.
2012-12-20 19:55:10 -05:00
Wliu
33ce484205
Update README.md
...
Final fix for the links. Should be good to go.
2012-12-20 19:53:24 -05:00
Wliu
ec5d96f2cb
Update README.md
...
And...one more time (sorry for these, but obviously I can't see how the
final format will be when I'm working offline >.>)
2012-12-20 19:52:28 -05:00
Wliu
a88f22b2b9
Update README.md
...
Small update
2012-12-20 19:51:28 -05:00
Wliu
64e31947a4
Update README.md
...
Updated Java JDK links (u10 came out)
Updated for 1.4.6 (MCP/Forge/MC/etc.)
Added new section for contributing.
Added quick-links to each section (may not work).
2012-12-20 19:48:21 -05:00
Wliu
fb0e98000d
Revert "Update .gitignore"
...
This reverts commit 05124df9b8
2012-12-20 19:29:02 -05:00
Wliu
9703f6d561
Revert "Add back updates.txt"
...
This reverts commit 6a151cc702
2012-12-20 19:29:01 -05:00
pahimar
f39a8f02d0
Merge pull request #126 from anonymouspineapple/patch-17
...
Updated Italian Alchemy Bag capitalization + colors
2012-12-20 16:27:21 -08:00
Adam
0806bb9ec3
Updated Alchemy Bag capitalization + colors
...
Capitalized everything for consistency, changed colors to match those used in the vanilla game, and fixed a typo (Irridiscente) found by my Italian-speaking friend.
2012-12-20 19:25:05 -05:00
pahimar
6bc714a704
Transmutation target block overlay (the spinny thing) can now be placed in any of the four corners of the screen, and the beginnings of a /ee3 command system
2012-12-20 16:45:50 -05:00
Wliu
05124df9b8
Update .gitignore
...
More later probably.
2012-12-19 22:04:11 -05:00
Wliu
6a151cc702
Add back updates.txt
...
Hate you Git
2012-12-19 19:02:33 -08:00
pahimar
46d95ca362
Some tweaks, some fixes, some removals of redundancies
2012-12-19 16:56:49 -05:00
pahimar
a1e45baf45
Derped and left unnecessary sysouts, added the named version of registerBlock
2012-12-19 13:49:39 -05:00
pahimar
95bd72e0d8
Successful transmutation events properly play sounds/particles on the client now
2012-12-19 13:47:45 -05:00
pahimar
38b2efa70c
Clean up unused imports and some formatting
2012-12-19 13:09:56 -05:00
pahimar
c6a5774867
Multiblock in world transmutation almost done
2012-12-18 21:57:38 -05:00
pahimar
21020bce90
Some more control for the user to say what they want a block to transmute into
2012-12-18 17:06:00 -05:00
pahimar
487fc17d19
Bump the version number, add some NPE protection to the version checker
2012-12-18 13:13:20 -05:00
pahimar
112b74dd30
Generalize more of the events, add the ability to have events fire before/after the action proposed
2012-12-18 13:05:04 -05:00
pahimar
d6aca678d5
Update to MC 1.4.6
2012-12-18 08:41:49 -05:00
pahimar
ac43b84302
Merge pull request #123 from pupaxxo/patch-2
...
Update resources/ee3/lang/it_IT.xml
2012-12-18 05:16:49 -08:00
André Carvalho
d5b25d9cc9
Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git
2012-12-18 13:02:47 +00:00
Andrea Ruggiero
efd7bc70d1
Update resources/ee3/lang/it_IT.xml
2012-12-18 14:00:58 +01:00
pahimar
35b83ceafd
Merge pull request #122 from LuzanelL/master
...
Chinese(Simplified) Localization Update
2012-12-17 13:46:43 -08:00
pahimar
24ab86083f
Some abstractions/etc related to action events and request events
2012-12-17 16:38:56 -05:00
