Commit graph

1554 commits

Author SHA1 Message Date
Pahimar e0718b48fe Merge remote-tracking branch 'origin/master' 2014-05-26 16:04:00 -04:00
Pahimar 39a6db0dce Playing around with some gradle improvements 2014-05-26 16:03:54 -04:00
pahimar 962f1a7def Merge pull request #673 from SquadMC/patch-1
Update README.md
2014-05-26 11:32:37 -04:00
pahimar 2c631f30f9 Merge pull request #679 from Enosphorous/master
Don't hardcode names in, use lang files!
2014-05-26 11:32:20 -04:00
Pahimar b1cad58550 Bump to Forge 1095, and proper use of ObjectHolder (protip: instance variable names should match object names for easier ObjectHolder use) 2014-05-26 11:28:51 -04:00
Enosphorous 22483a7839 Don't hardcode names in. 2014-05-26 08:19:19 -07:00
pahimar abde1fc874 Missed some files 2014-05-25 10:00:38 -05:00
pahimar 7bd8adf478 Working keybinding listener, and first stab at the ObjectHolder (some more learning necessary it seems, so commented out at the moment) 2014-05-25 09:55:50 -05:00
pahimar 06dced01b3 Merge remote-tracking branch 'origin/master' 2014-05-24 15:52:34 -05:00
pahimar d18a1c2f3c Working on keybindings, going to test a FML fix for SimpleNetworkWrapper later 2014-05-24 15:52:23 -05:00
pahimar 31713ee4e6 Merge pull request #678 from theflogat/patch-1
Adding a needed parameter to @Instance
2014-05-24 14:18:15 -05:00
theflogat e3d6273d01 Adding a needed parameter to @Instance
Adding a needed parameter to @Instance to avoid problems.
2014-05-24 19:54:46 +02:00
pahimar 99527d35a8 Working on keybindings 2014-05-22 17:35:31 -05:00
pahimar 61e9278915 Bump up Forge version to Forge 1084 2014-05-20 22:20:08 -04:00
Pahimar a2a82d3d36 Tweaking some build script and mcmod stuff 2014-05-16 11:48:51 -04:00
Pahimar dbae8445ab Missed a period 2014-05-15 14:54:20 -04:00
Pahimar 36256cdd3f Improving the build gradle script a bit 2014-05-15 14:49:52 -04:00
pahimar 422fd7abc7 Update build.gradle 2014-05-04 21:13:13 -04:00
Pahimar 8ee4fa0147 Some starter work on keybindings and config files 2014-05-02 16:06:56 -04:00
pahimar 26d3a5dd11 Re-implemented Alchemical Bag functionality, and added back the fuel handler 2014-04-30 19:33:29 -04:00
pahimar cf1dcfa1a0 Merge remote-tracking branch 'origin/master' 2014-04-30 18:03:22 -04:00
pahimar 5a8665a581 Fixes chest lids in MP 2014-04-30 18:01:35 -04:00
pahimar 3362621750 Moving the intialization of items and blocks to the init package, and simplifying things and removing the infused blocks (Aludel recipes will take their place) 2014-04-29 22:26:30 -04:00
pahimar ac207393fe Managed to get a few things done today 2014-04-29 21:46:59 -04:00
pahimar 5794037f51 Getting ma groove on 2014-04-28 21:24:31 -04:00
Sam 661270784f Update README.md
Fixed Readme for Copy and past for `setupCiWorkspace`
2014-04-28 19:29:47 +01:00
Pahimar 7acc4f0c16 Bump the version of Forge to 1061 2014-04-23 09:00:45 -04:00
pahimar 664387f063 Machines: Getting them to render in world. Still not functional. 2014-04-11 16:01:11 -04:00
pahimar ac14fe32ab Machines: Getting more of the machines implemented, still a WIP 2014-04-11 07:06:32 -04:00
pahimar f6d58abca2 Getting Alchemical Chests into the port. They definitely aren't finished yet, networking still to be done. 2014-04-10 19:59:04 -04:00
pahimar 7b97cea430 Backport to Forge 1056, something's not hashing with Forge 1057 2014-04-07 19:57:44 -04:00
pahimar 294cd5f7db Update build.gradle
Update to Forge 1057
2014-04-07 19:35:28 -04:00
pahimar c0a2f2d929 Some more work on stuffs 2014-04-01 22:47:08 -04:00
pahimar 1821b3ebbc Update to Forge 1048 2014-04-01 19:47:39 -04:00
pahimar 16edfe03a4 Bunch more work on porting Items. More to come tonight 2014-04-01 16:11:52 -04:00
pahimar 28c7b80a66 Checking in gradle wrapper 2014-03-30 08:50:23 -04:00
pahimar 4410c25bd6 Don't be scared - it's easier to start from the bottom. There's also still the MC 1.6.4 branch :) 2014-03-28 15:54:15 -04:00
pahimar 059d9614c1 Another pass at the 1.7 update - more to come tomorrow 2014-03-27 22:21:21 -04:00
pahimar 9070ad038b First initial pass of 1.7 update 2014-03-27 21:36:03 -04:00
pahimar 9f56070058 First initial pass of 1.7 update 2014-03-27 21:34:47 -04:00
pahimar 065d129b76 Resolves #661 2014-03-27 15:26:04 -04:00
pahimar ea280ba2aa Resolves #661 2014-03-27 15:24:09 -04:00
pahimar edfae623e5 Update version.xml 2014-03-27 13:40:11 -04:00
pahimar f9f957e03e Merge pull request #648 from lluixhi/patch-1
Update version.xml
2014-03-27 13:38:46 -04:00
pahimar 4afb522238 Merge pull request #646 from 50Wliu/README
Update README.md
2014-03-27 10:58:39 -04:00
pahimar 224f347878 Allow Alchemical Upgrades to stack up to 64 2014-03-27 10:52:43 -04:00
pahimar c51a9aa415 Potentially fixes #660 2014-03-27 10:51:35 -04:00
pahimar ef2de23f54 Add some Aludel recipes to upgrade Ash into different dusts, based on other dusts 2014-03-27 09:46:07 -04:00
pahimar 94c808668b Merge pull request #653 from Dynious/chestUpgrades
Added in-world upgrades for alchemical chests
2014-03-27 09:45:59 -04:00
pahimar 49db646cb4 Update localizations to reflect that bags work 2014-03-26 21:40:22 -04:00