Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
718 commits 1 branch 0 tags 11 MiB
Commit graph

718 commits

This branch
This branch
All branches
Author SHA1 Message Date
pahimar
984dcd7b4a Some fixes 2012-12-31 03:14:44 -05:00
pahimar
50b822c15c Merge pull request #147 from nevercast/fix-smpbug 
Fix for SMP bug
 2012-12-30 23:23:13 -08:00
NeverCast
c1074aae40 Fix for SMP bug 2012-12-31 18:37:57 +13:00
pahimar
9f17edf31c Merge pull request #146 from nevercast/master 
Previous Block Helper + Reverse toggle with Crouch
 2012-12-30 21:23:24 -08:00
NeverCast
c6e8ccb39a Added code for minium stone also 2012-12-31 17:06:31 +13:00
NeverCast
96639ee9d0 Added previousBlock helper methods 
You can reverse cycle with crouch+g key
 2012-12-31 17:04:34 +13:00
pahimar
db2891c508 Fixed a big bug that prevented in world transmutation working in SMP environments (sorry guys), and fixed the ability to cycle through transmutation options while in SMP (half-assed, will revisit) 2012-12-30 22:03:12 -05:00
pahimar
ea431cb3e7 Finished up the EE3 command, for now 2012-12-30 20:42:27 -05:00
pahimar
36e296a53d Merge pull request #143 from narc0tiq/patch-1 
Fix EE3+NetherOres+PetroGen startup crash
 2012-12-30 17:42:04 -08:00
pahimar
02a3dfa51d Merge pull request #145 from Pyker/patch-2 
Fixed BOM in localization files
 2012-12-30 17:29:40 -08:00
pahimar
bbc75fcc1a Merge pull request #142 from pksiazek/master 
Fixed AddonRedPower2 Exception
 2012-12-30 17:29:22 -08:00
pahimar
45dd0994e4 Merge pull request #144 from pupaxxo/patch-4 
Update version.xml
 2012-12-30 07:07:50 -08:00
Pedro Cunha
908d490827 Fixed BOM in localization files 2012-12-30 01:14:49 +00:00
Andrea Ruggiero
dd5879737c Update version.xml 2012-12-29 19:03:21 +01:00
Octav Sandulescu
a001e25dfd Fix EE3+NetherOres+PetroGen startup crash 2012-12-29 16:11:58 +02:00
Wliu
7755f9ecf6 Update README.md 
Stuff, more stuff, told people how to let Forge install MCP for them (untested!)
 2012-12-28 21:00:36 -05:00
Wliu
5698d2249d Update README.md 
Fix *** mess-up (directories).  Can't guarantee that it will fix it, only browser I have access to right now is IE >.>
 2012-12-28 20:50:48 -05:00
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