Commit graph

1575 commits

Author SHA1 Message Date
pahimar
d346895154 Working on some more support for IC2 (good test of the API and how the mod will handle interaction with other mods) 2013-12-17 15:43:31 -05:00
pahimar
beec013625 Playing around with a smarter RecipesVanilla 2013-12-16 23:08:46 -05:00
pahimar
5863efcee6 More work on common ore recipes/emc 2013-12-16 15:50:23 -05:00
pahimar
6e6dfac1f6 Some work on common ore recipes/emc 2013-12-16 14:17:55 -05:00
pahimar
2914f15051 Merge pull request #513 from eslachance/master
Added French localisation
2013-12-16 07:46:07 -08:00
pahimar
7e105f96e8 Merge pull request #515 from 50Wliu/README
Updated README.md
2013-12-16 07:35:31 -08:00
pahimar
a6025ddba8 Fix RecipeMappings for IMC related API calls 2013-12-15 23:15:30 -05:00
Wliu
fa2245e292 The all-mighty @Lluixhi is never wrong! 2013-12-15 20:55:13 -05:00
Wliu
626f16b1c5 I AM AMAZING AT MY PROOFREADING SKILLS 2013-12-15 20:45:10 -05:00
Wliu
29079a3342 Added Gradle install instructions
Also fixed minor grammar stuffs
2013-12-15 20:35:54 -05:00
pahimar
aeaad5d046 Switched to LF vs CRLF line breaks, and code formatting changes 2013-12-15 20:26:42 -05:00
pahimar
c185649e2e Merge pull request #514 from lluixhi/master
Updated README for gradlization.
2013-12-15 15:36:57 -08:00
lluixhi
7c8f98ff05 Fixed numbering. 2013-12-15 12:58:59 -08:00
lluixhi
26a1ccb302 Updated for gradlized build in 1.6.4
(Forge 9.11.1.964)
2013-12-15 12:54:38 -08:00
pahimar
1a25990b6f Comment to remind me where to pick up tomorrow 2013-12-14 22:54:03 -05:00
pahimar
557a05fc9a Fixed a minor bug in the gradle build, and some prelim work on EmcValues for other mods. LOTS of optimization there still 2013-12-14 22:53:01 -05:00
Evelyne Lachance
3f439c38a3 Added French localisation 2013-12-14 21:48:24 -05:00
pahimar
f42f3df27e Updating the gradle build to accommodate my keystores/signatures, and changing the version number schema 2013-12-14 20:04:17 -05:00
pahimar
2623db52d7 Merge pull request #500 from AbrarSyed/master
Gradlization -- COMPLETE
2013-12-14 14:32:29 -08:00
AbrarSyed
51b756e17a Step 3: The Rebirth 2013-12-13 03:45:03 -06:00
AbrarSyed
1c3041ce5d Step 2: The Reformation 2013-12-13 03:21:58 -06:00
AbrarSyed
bb3fed7bb8 Step 1: The Purge 2013-12-13 03:17:08 -06:00
pahimar
fd05e3b8fe Merge pull request #496 from ProofTheEngineer/patch-1
Word Change In sv_SE.lang
2013-12-12 19:03:20 -08:00
pahimar
684731d1a4 Merge pull request #505 from VeryBigBro/patch-1
Update ru_RU.lang
2013-12-12 19:02:55 -08:00
pahimar
53ecacaae3 Merge pull request #504 from Vexatos/patch-1
Cleanup in de_DE.lang
2013-12-12 19:02:47 -08:00
Anton
2be88c49e1 Update ru_RU.lang 2013-11-30 17:59:56 +03:00
Vexatos
10ffd96b15 Update de_DE.lang 2013-11-30 12:25:25 +01:00
pahimar
a2e406bf7e Some duplicate and null checking when assigning EmcValues 2013-11-28 22:48:56 -05:00
pahimar
915fac1b1b Fix derp in WrappedStack constructor, when given another WrappedStack as
the parameter
2013-11-27 14:51:10 -05:00
pahimar
f8b998eec1 Should fix up assigning EmcValues via IMC 2013-11-27 14:32:01 -05:00
pahimar
498c29db31 More IMC stuff 2013-11-26 23:42:45 -05:00
pahimar
1109bf31db Removing the unnecessary EmcBlacklist, and some work on IMC 2013-11-26 23:22:40 -05:00
pahimar
1055424028 Remove more traces of CustomWrappedStack 2013-11-26 22:32:49 -05:00
pahimar
79eafef777 Fair bit of rewriting of CustomWrappedStack (now just WrappedStack).
Will make for easier API related stuffs
2013-11-26 22:23:36 -05:00
ProofTheEngineer
5866989322 Grammar Changes In sv_SE.lang 2013-11-24 14:50:22 +01:00
pahimar
d02df4759d Merge pull request #494 from RedmenNL/master
Added handling of more recipes
2013-11-23 08:41:02 -08:00
RedmenNL
125dac594b Added recipes for fluid containers. 2013-11-23 16:13:35 +01:00
RedmenNL
63d38ceffd Added handling of recipe ICM messages. 2013-11-23 13:40:44 +01:00
pahimar
fa1d7b2839 Tick handler to handle the gathering and processing of runtime imc
messages to EE3
2013-11-23 01:29:49 -05:00
pahimar
d097a422a4 Some API related work 2013-11-20 21:18:04 -05:00
pahimar
a034a379c4 Something something more dark side 2013-11-20 20:17:32 -05:00
pahimar
6f16e3296b Rework how the IMC handler works a bit, add in FluidStack support for
CustomWrappedStack, and a few other things
2013-11-19 22:17:31 -05:00
pahimar
b556c05099 Working towards json serialization of objects in the mod, for later API
support
2013-11-19 21:43:41 -05:00
pahimar
ce3097c7e4 Switching PCs 2013-11-19 20:19:33 -05:00
pahimar
02eead3672 Pretty massive cleanup of stuff, some is gone for good, some is coming
back later
2013-11-19 19:42:29 -05:00
pahimar
281716346a Merge pull request #490 from RedmenNL/master
Fixed recipe value assignment when mods with custom IRecipe handler are added
2013-11-19 08:27:47 -08:00
RedmenNL
cb88d29615 Fixed recipe value assignment when mods with custom IRecipe handler are added 2013-11-19 17:23:14 +01:00
pahimar
549f5031e8 Something something dark side 2013-11-18 19:34:48 -05:00
pahimar
aadda4af79 Merge pull request #489 from 50Wliu/build.properties
Fixed build.properties
2013-11-18 16:34:18 -08:00
Wliu
1c70aa0954 Fixed .gitattributes 2013-11-18 18:00:51 -05:00