tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
1916 commits 2 branches 0 tags 102 MiB
Commit graph

1916 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Spiers 4e32a77ac8 Fix Client/Server issues. 2014-07-07 23:33:48 +01:00
Aidan C. Brady 83ff761ec4 Fix a bug with takeTopItem() inventory management. This fixed it, @ErogenousBeef! 2014-07-07 18:21:22 -04:00
Ben Spiers f26c49d6b4 Add a mcmod.info for development purposes. 2014-07-07 21:23:04 +01:00
Ben Spiers df58560729 Clean up configs a lot; Fix Config GUIs. This will require people to sort out their configs on their own, as things have moved. 2014-07-07 21:23:04 +01:00
Aidan C. Brady f67be01658 Tank-based fluid container interaction fixes. Can't figure out the data request issue. 2014-07-07 15:54:26 -04:00
Ben Spiers 8a8086af3f Merge branch '1.7.10' into development 2014-07-07 15:45:33 +01:00
Ben Spiers f0ad905c07 Merge branch '1.7.10' into development 
Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/voice/VoiceConnection.java
 2014-07-07 15:43:53 +01:00
Ben Spiers 964a26822d Update FMP, add MC version to version string and make my home-built jars not be 7.0.0.null any more. Also because I needed to use the elvis operator (?:) after learning of the existence of the elvis operator. 2014-07-07 15:28:15 +01:00
Ben Spiers 3b32d5a18c Update forge 2014-07-07 15:09:10 +01:00
Ben Spiers 786d399c2c Require Forge 10.12.2.1147 or above. 2014-07-05 14:39:25 +01:00
Aidan C. Brady 9562f53328 Bump versions of new CCLib and FMP 2014-07-04 23:58:08 -04:00
Aidan 1914910c78 Merge pull request #1435 from BrunoLG/patch-3 
Update pt_BR.lang
 2014-07-02 18:39:39 -04:00
Ben Spiers 5e08f8110a We can depend on APIs directly now :) 2014-06-27 20:00:10 +01:00
Ben Spiers 589d5f420f Recommit update changes that were seemingly lost in a rebase-pull. 2014-06-27 20:00:10 +01:00
Ben Spiers d9b6a48d33 Build script changes to make it compile in 1.7.10 (still won't run due to no FMP version but it's the best I could do). 
Make mcmod.infos and dependancies.info fill in version numbers at build time.
 2014-06-27 20:00:10 +01:00
Ben Spiers 55f8dbfbad PacketDataRequest.onMessage is being called on the client side in SSP. Stop that from crashing the client, but is it a problem that it's being called at all? 2014-06-27 20:00:10 +01:00
Ben Spiers 9383ea24b6 Add dependencies to stop some crashes. 2014-06-27 20:00:09 +01:00
Dashkal 84bed9b2b1 Port to forge-10.12.2.1121 (was 10.12.1.1112) 
* Updated build.properties
 * Now using the new OreDictionary.getoreIDs() call to obtain oreDict names
 * No longer modifying OreDictionary collections in ChemicalInjectionRecipeHandler
 * No longer registering list redstone under oreRedstone (causes an NPE)
 2014-06-27 20:00:09 +01:00
Aidan C. Brady 5397de0bfa Added a crafting recipe for rails using osmium. Thanks, casilleroatr 2014-06-27 20:00:09 +01:00
Aidan C. Brady 205a6feab5 Revert "Update to 1.7.10. Thanks for getting the API stuff set up, @unpairedbracket, I'm using Forge 1152 now." 
This reverts commit 604f138f71.
 2014-06-27 20:00:09 +01:00
Ben Spiers 1f12d2a91d PacketDataRequest.onMessage is being called on the client side in SSP. Stop that from crashing the client, but is it a problem that it's being called at all? 2014-06-27 16:20:02 +01:00
Ben Spiers 3616d19147 Add dependencies to stop some crashes. 2014-06-27 16:20:02 +01:00
Dashkal 9b3ee926e2 Port to forge-10.12.2.1121 (was 10.12.1.1112) 
* Updated build.properties
 * Now using the new OreDictionary.getoreIDs() call to obtain oreDict names
 * No longer modifying OreDictionary collections in ChemicalInjectionRecipeHandler
 * No longer registering list redstone under oreRedstone (causes an NPE)
 2014-06-27 16:20:02 +01:00
Aidan C. Brady de6d418697 Added a crafting recipe for rails using osmium. Thanks, casilleroatr 2014-06-27 10:56:56 -04:00
Aidan C. Brady 5b51f6b444 Merge branch 'master' into development 
Conflicts:
	common/mekanism/common/PacketHandler.java
 2014-06-26 23:48:33 -04:00
Aidan C. Brady 3b5438a064 Merge branch 'master' into 1.7.10 
Conflicts:
	common/mekanism/common/PacketHandler.java
 2014-06-26 23:47:43 -04:00
Aidan C. Brady 7ca2090bc7 Revert "Update to 1.7.10. Thanks for getting the API stuff set up, @unpairedbracket, I'm using Forge 1152 now." 
This reverts commit 604f138f71.
 2014-06-26 23:43:35 -04:00
Aidan C. Brady 604f138f71 Update to 1.7.10. Thanks for getting the API stuff set up, @unpairedbracket, I'm using Forge 1152 now. 2014-06-26 23:40:02 -04:00
Ben Spiers 4d0f276e55 Fix a server crash relating to a client-side only class initialization (credit to @kosakriszi). Closes #1442. 2014-06-27 03:25:47 +01:00
Ben Spiers ff1b3b792e Config GUIs are cool. 2014-06-27 03:22:46 +01:00
Ben Spiers ac223c8df5 Fix ic2 pulling and IConfigurable passthrough (leaving the OreDict fix for the Pull Request). getConnectedOutputters was broken. 2014-06-26 23:47:33 +01:00
Ben Spiers 3a027d0ef4 Aaaaaaand ComputerCraft. 2014-06-26 21:07:46 +01:00
Ben Spiers f463416c0c Metallurgy was easier than expected. 2014-06-26 20:18:03 +01:00
Ben Spiers 26463711de Galacticraft and MFR API Optional-ing 2014-06-26 20:17:45 +01:00
Ben Spiers 8ddda5d0dc BuildCraft now also working without shipping API 2014-06-26 19:28:40 +01:00
Ben Spiers 611d4c8f52 Got some IC2 stuff working now. Turns out I was being stupid. 2014-06-26 18:18:18 +01:00
Aidan C. Brady ab07313573 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-06-26 01:20:15 -04:00
Aidan C. Brady bc3636aaec Quick cleanup 2014-06-26 01:20:09 -04:00
Ben Spiers 9c58ed549f Start of work on Doing It Right™. Appears to work for cofh's API, not yet for IC2 or BC. Not sure why. Might have to ask @cpw. 2014-06-26 01:10:53 +01:00
Ben Spiers 82a708c7b2 Remove bits of APIs that are unneeded. First step in attempting to Do It Right™ 2014-06-24 20:33:25 +01:00
BrunoLG 9feb98953a Update pt_BR.lang 2014-06-24 15:51:27 -03:00
Aidan C. Brady d5812b63ec Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-06-22 13:39:49 -04:00
Aidan C. Brady 576470784b Fix OreDict registration typo 2014-06-22 08:48:16 -04:00
Aidan 4b0386f05a Merge pull request #1432 from Adaptivity/patch-3 
Update ru_RU.lang
 2014-06-21 15:23:50 -04:00
Anton 1252cf7c80 Update ru_RU.lang 2014-06-21 22:07:56 +04:00
Aidan C. Brady 59df1b5c8f Properly load MekanismTools configuration 2014-06-21 11:57:08 -04:00
Aidan C. Brady b3a3dbb827 Corrected that fix! 2014-06-21 00:34:09 +02:00
Aidan C. Brady 62e14b3a2e Fixed loop with Portable Tank push 2014-06-21 00:31:44 +02:00
Aidan C. Brady b7a142ba6b Fluidic Plenisher model! 2014-06-20 20:13:20 +02:00
Aidan C. Brady efc72769d6 Fix offsets, implement some of @tterrag1098's changes 2014-06-19 20:47:45 +02:00