Commit Graph
39 Commits
Author SHA1 Message Date
Ben Spiers ac39b6fabe Merge branch 'v9' into 1.8.9 2016-02-08 14:55:27 +00:00
aidancbrady 2bea8ac29a Work on Thermodynamic Conductors 2016-02-03 11:08:36 -05:00
Ben Spiers dd99f582af State & Render stuffs, get the MInfuser rendering again.
Still no textures. WIP.
2016-01-27 01:36:39 +00:00
Ben Spiers a27c9b6839 tile package done, except for TEDigitalMiner 2016-01-25 04:36:00 +00:00
Ben Spiers a80f724cc2 Apply various common one-to-one replacements
More work on common too. network package now done.
2016-01-23 13:24:51 +00:00
Ben Spiers 4247ba136a Fix compile errors in API package 2016-01-16 14:35:01 +00:00
Ben Spiers 9b8d9d92d6 Start update to 1.8.9
Fix all references to cpw.mods.fml namespace
2016-01-14 19:22:48 +00:00
aidancbrady f5c48f60e6 Teleport now specifies orientation, closes #2977 2015-11-27 10:41:45 -07:00
Shadowfacts 4e87e281c9 Force the player's experience to sync when changing dimensions
(Thank you, @Gebatzens)

Fixes #2943

Also add misc IDEA files to .gitignore
2015-09-06 13:23:19 -04:00
aidancbrady c7fe1f86eb Cleaner CC support with a separate peripheral handler 2015-07-20 12:28:18 -07:00
Aidan C. Brady 41cfed37b7 Fixed a few crashes 2015-04-03 20:21:05 -04:00
Aidan C. Brady 7bfaa738e3 Fixed teleporter crash 2015-03-19 08:53:43 -04:00
Aidan C. Brady ca16c64de1 Fixed a crash 2015-03-12 23:37:04 -05:00
Aidan C. Brady f9c10d9012 More work on teleporters, implemented chunkloading 2015-03-12 22:55:37 -05:00
Aidan C. Brady 9c21621c06 Just about finished! Teleporter & Portable Teleporter work with the new frequency system perfectly. 2015-03-12 17:30:40 -05:00
Aidan C. Brady 9043e12938 Work on new Portable Teleporter GUI - going to basically be a clone of the regular teleporter GUI without an inventory view 2015-03-12 11:18:12 -05:00
Aidan C. Brady d16a6f06ee Teleporting works! Tomorrow I'll try and implement the Portable Teleporter. 2015-03-12 01:32:24 -05:00
Aidan C. Brady cefd4ba107 Fixed another NBT issue 2015-03-12 01:18:21 -05:00
Aidan C. Brady c2c3bd14bc Many fixes - still need to get private frequencies to load 2015-03-12 01:03:31 -05:00
Aidan C. Brady dc611eb0b2 Work on GUI, things are starting to work 2015-03-11 18:13:47 -05:00
Aidan C. Brady 76b93bec65 More teleporter work. Getting pretty complicated, hopefully I can pull this off 2015-03-11 17:42:33 -05:00
Aidan C. Brady 5e5975bc58 Work on new teleporter system - still a lot to do 2015-03-11 10:58:15 -05: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
Ben Spiers fab95e8900 Re-organise imports.
I went for what seemed like a good level of organisation:

Java
__________
Mekanism
__________
Minecraft
Forge
FML
__________
Netty
LWJGL
__________
Other APIs
__________
Static Imports.
2014-09-03 19:00:03 +01:00
Ben Spiers 725b7463f0 Make the mod classes significantly less godlike.
Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:35:06 +01:00
Aidan C. Brady aaffc3e364 Updated some imports and added textures 2014-07-26 16:45:48 -04:00
Aidan C. Brady 146d974479 Fixed Teleporter localization, fixed balloons placing on non-solid sides, added AE processing recipes, improve tele porter efficiency 2014-07-14 17:14:32 -04:00
Aidan C. Brady a24bd2e7ad A bit of work on teleporter localization. There's something weird going on, though. 2014-07-14 12:57:57 -04:00
Ben Spiers 3a027d0ef4 Aaaaaaand ComputerCraft. 2014-06-26 21:07:46 +01:00
Aidan C. Brady e5f76907ce Rewrite networking code for the 100th time to fix memory leak 2014-06-11 11:57:49 +02:00
Aidan C. Brady b365494f2e Fixed up logger, added needed overlays 2014-06-03 08:46:03 +02:00
Aidan C. Brady 659b963af6 Alright, almost done with network changes (63 errors!) 2014-06-02 16:52:13 +02:00
Aidan C. Brady ec2040cccc Work on networking update 2014-06-01 17:42:23 +02:00
Aidan C. Brady fa0c2e6f12 More bits of work 2014-05-30 23:10:05 +02:00
Aidan C. Brady d1c193d0dd Loads more work. 275 errors. 2014-05-29 19:01:43 +01:00
Ben Spiers 3d8c5c8696 More fixes. Around 1000 errors now, going to have to leave it to you from here on in @aidancbrady. 2014-04-20 22:34:45 +01:00
Ben Spiers 31938e8b68 Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +01:00
Ben Spiers db7121454a Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things.
1792 errors. A good night's work, I think.
2014-04-20 04:34:19 +01: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