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

60 commits

Author SHA1 Message Date
aidancbrady 0e0f9584f3 Bumped version, fixed Steel Casing recipe, fixed erratic heat behavior, fixed Turbine render crash, added missing localization, fixed Bin crafting crash 2016-05-21 13:52:28 -04:00
aidancbrady 4c2b470213 Renamed Wind Turbine to Wind Generator, started work on turbine rods/blades for Industrial Turbine 2016-01-17 15:59:02 -05:00
aidancbrady 6466463a63 Bumped version 2015-11-26 15:44:42 -07:00
Ben Spiers 9a3f0ae633 Version Number Update: 8.1.7 2015-07-28 18:46:00 +01:00
aidancbrady 7799afed53 Go ahead and bump Forge to latest recommended, 1291 is looking too old 2015-07-14 14:22:27 -07:00
aidancbrady 7607a135ce Bump version to 8.1.6 2015-06-23 15:20:03 -07:00
aidancbrady aec238dde5 Version bump, improved Rotary Condensentrator crafting recipe, made Solar Evaporation Controller use new gauge standards 2015-06-11 19:59:19 -04:00
aidancbrady 3cd05489d9 Bump version to 8.1.4 2015-05-29 23:19:43 -04:00
tterrag1098 b70c0e015f Remove hard dep on unnecessarily new forge version 2015-05-13 17:18:21 -04:00
aidancbrady 3185f1bf22 Bumped version to 8.1.3 2015-05-05 10:45:59 -04:00
aidancbrady d3efaa6b09 Fix CCC version 2015-04-25 15:31:35 -07:00
aidancbrady 9414b74f60 Fix build? 2015-04-25 15:28:21 -07:00
Aidan Brady 3c1bbc978e Hopefully fixed Forge version 2015-04-25 13:19:32 -07:00
Aidan Brady 8030b0e057 Fixed icons, bumped Mekanism version to 8.1.2, bumped Forge to 1395, updated CB libraries 2015-04-25 13:14:10 -07:00
Ben Spiers e6ee804686 Update forge again. 2015-04-17 18:27:41 +01:00
Ben Spiers 03e45cc401 Back to Forge 1291. 
Turns out I do silly things when I'm tired...
 2015-04-12 03:38:33 +01:00
Ben Spiers 866abf5c8d Fix build. 2015-04-12 00:38:28 +01:00
Ben Spiers 66ce6c6827 Update dependencies. 2015-04-12 00:12:40 +01:00
Aidan C. Brady a03ef85f4c Fixed compile, bumped version to 8.1.1 2015-04-10 08:24:28 -04:00
Aidan C. Brady 8d38f63f5f Bumped version to 8.1.0 2015-04-01 23:09:27 -04:00
Aidan C. Brady 2546d9c28e Bump version to 8.0.3 2015-03-26 18:08:56 -04:00
Aidan C. Brady d2c6effabb Bump version to 8.0.2 2015-03-22 21:57:28 -04:00
Aidan C. Brady 8173af50e0 Bump version to 8.0.1 - preparing to fix some bugs 2015-03-20 15:28:20 -04:00
Halvor Lyche Strandvoll 5dd4fe9029 Added CodeChickenCore as dependency for development enviroments. 2015-03-19 14:49:41 +01:00
Ben Spiers 797308f587 Update Forge version. 
Account for the random inexplicable non-existence of FMLRenderAccessLibrary
 2015-03-16 15:22:19 +00:00
Ben Spiers aa91fa87a6 Update some dependencies. 2015-01-08 05:27:08 +00:00
Ben Spiers b31aa92844 Update lots of APIs, most notably BC and an actual 1.7 version of CC 
Conflicts:
	build.properties
	src/api/java/buildcraft/api/core/BlockIndex.java
	src/api/java/buildcraft/api/core/BuildCraftAPI.java
	src/api/java/buildcraft/api/fuels/IFuel.java
	src/api/java/buildcraft/api/mj/BatteryObject.java
	src/api/java/buildcraft/api/mj/IBatteryIOObject.java
	src/api/java/buildcraft/api/mj/IBatteryObject.java
	src/api/java/buildcraft/api/mj/IOMode.java
	src/api/java/buildcraft/api/mj/MjAPI.java
	src/api/java/buildcraft/api/mj/MjBattery.java
	src/api/java/buildcraft/api/power/PowerHandler.java
	src/api/java/buildcraft/api/recipes/CraftingResult.java
	src/api/java/buildcraft/api/recipes/IAssemblyRecipeManager.java
	src/api/java/buildcraft/api/recipes/IFlexibleRecipe.java
	src/api/java/buildcraft/api/recipes/IRefineryRecipeManager.java
	src/api/java/buildcraft/api/transport/IPipe.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/FuelHandler.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java
	src/main/java/mekanism/common/multipart/MultipartMekanism.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
	src/main/java/mekanism/common/network/PacketConfigSync.java
	src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
	src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
	src/main/java/mekanism/common/util/CableUtils.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/common/util/TransporterUtils.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
 2014-11-13 19:30:39 +00:00
Aidan C. Brady ba71f26a75 Updated Forge 2014-08-25 08:43:16 -04:00
Ben Spiers e6957c1561 Update Forge 2014-08-05 01:49:25 +01:00
Aidan C. Brady cf6f5ab387 Bump versions to 8.0.0 2014-07-12 18:52:46 -04:00
Aidan C. Brady d72ce6532b Updated Forge to 10.13.0.1180. 2014-07-12 12:35:42 -04:00
Aidan C. Brady ab0f002c5e Fixed FMP version! 2014-07-12 01:17:21 -04:00
Aidan C. Brady f597bce107 Updated Forge to 1179 2014-07-11 22:25:06 -04: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
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 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 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
Aidan C. Brady 7b6eb46a33 Hopefully fixed Forge 2014-06-14 00:22:15 +02:00
Aidan C. Brady c9ce7f1983 Hopefully got NEI to download 2014-06-13 19:45:28 +02:00
Aidan C. Brady 5a4b229ca6 Whoops 2014-06-13 12:41:26 +02:00
Aidan C. Brady c2e0e2eb44 Try updating forge 2014-06-13 12:40:08 +02:00
Aidan C. Brady 8b7904563d Hopefully fix something 2014-06-13 12:27:35 +02:00
Aidan C. Brady dd4fa16d00 Update FMP and CCLIB versions 2014-06-13 00:45:28 +02:00
Aidan C. Brady 43a80c7a89 Update forge version 2014-06-13 00:34:54 +02:00
Aidan C. Brady c72e1c6efc Work on transmitters 2014-06-08 01:17:47 +02:00
Aidan C. Brady b387c8529d Bumped version to 7.0.0, a few fixes and enhancements 2014-06-06 00:16:36 +02:00
Ben Spiers ab47724473 Move the directory structure around to a more conventional one and start out on the 1.7 update. 
3797 errors. We have a long way to go.
 2014-04-20 03:44:06 +01:00
Aidan C. Brady 8b70e0d50d v6.0.4 push 2014-03-07 10:46:43 -05:00
Aidan Brady 8070b3ebd7 Bump version to 6.0.3 2014-03-01 11:12:04 -05:00