Commit Graph
159 Commits
Author SHA1 Message Date
aidancbrady 0e9f380bd7 Forge Energy support, added full functionality for Tesla 2017-03-29 12:56:20 -04:00
aidancbrady 2aad738c3d Temporarily disable multipart functionality, got transmitters to work, reorganize multipart code 2017-03-28 22:49:29 -04:00
aidancbrady 2f705768e4 Work on overhaul of transmitters 2017-03-28 19:32:32 -04:00
aidancbrady 6a42eb64e3 Update to 1.11.2. Untested, still using outdated MCMP 2017-03-25 20:35:26 -04:00
aidancbrady c510ce7d8c Merge branch '1.7.10' into 1.10
* 1.7.10:
  Added version-based handling, bump version to 9.1.1
  Bump up Dynamic Tank max storage, fixed Factory container issue
  Add config option to disable block protections
  Fixed chunk churning issue with frames
  Restrict Thermal Evaporation Plant output to needed
  Going back to MIT, thanks to the concerns of @bshelden and @asiekierka

Conflicts:
	build.properties
	src/main/java/mekanism/api/MekanismConfig.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/ThreadGetData.java
	src/main/java/mekanism/common/block/BlockBounding.java
	src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
	src/main/java/mekanism/common/item/ItemBlockGasTank.java
	src/main/java/mekanism/common/item/ItemBlockMachine.java
	src/main/java/mekanism/common/network/PacketConfigSync.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java
	src/main/java/mekanism/tools/common/MekanismTools.java
2016-11-27 13:33:57 -05:00
Clienthax 03191f198b Add config option to disable block protections 2016-08-15 02:58:15 +01:00
aidancbrady 8e1ee9a581 Chunk Loader Upgrades. They work with Digital Miners and automatically adjust to their mining radius. 2016-08-10 15:37:29 -04:00
aidancbrady 3b07db3dc0 Fixed Mechanical Pipe crash, fixed Induction Cell issue, added Creative Fluid Tank and removed prefilled tanks 2016-08-07 19:58:45 -04:00
aidancbrady 3505d553d9 Merge branch 'development' into 1.9.4
* development:
  Fixed Robit AI
  Fixed Robit dupe glitch
  Fixed the stupid invalid frequency issue

Conflicts:
	src/main/java/mekanism/client/ClientProxy.java
	src/main/java/mekanism/client/gui/GuiRobitCrafting.java
	src/main/java/mekanism/client/gui/GuiRobitRepair.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/RobitAIPickup.java
	src/main/java/mekanism/common/inventory/container/ContainerRobitCrafting.java
	src/main/java/mekanism/common/inventory/container/ContainerRobitRepair.java
	src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
2016-07-05 18:42:43 -04:00
aidancbrady cdf4b16ec1 Fixed Robit dupe glitch 2016-07-05 17:30:34 -04:00
aidancbrady 53353cd050 Fixed IC2 support (still may crash without), begin adding Tesla support 2016-07-01 11:05:02 -04:00
aidancbrady b624309837 Merge branch 'development' into 1.9.4
* development:
  Added Fluid Tank comparator support, fixed Gas Tank comparator support
  Implement config option for operators to bypass security, added turbine dump/dump excess functionality
  Fixed Tesseract and Flux Duct support
  Updated IC2 API, fixed integration

Conflicts:
	src/api/java/ic2/api/Direction.class
	src/api/java/ic2/api/Direction.java
	src/api/java/ic2/api/crops/CropCard.class
	src/api/java/ic2/api/crops/CropCard.java
	src/api/java/ic2/api/crops/ICropTile.class
	src/api/java/ic2/api/crops/ICropTile.java
	src/api/java/ic2/api/energy/prefab/BasicSink.class
	src/api/java/ic2/api/energy/prefab/BasicSource.class
	src/api/java/ic2/api/info/Info.class
	src/api/java/ic2/api/item/IC2Items.class
	src/api/java/ic2/api/item/ILatheItem.class
	src/api/java/ic2/api/item/ILatheItem.java
	src/api/java/ic2/api/network/NetworkHelper.class
	src/api/java/ic2/api/network/NetworkHelper.java
	src/api/java/ic2/api/recipe/RecipeInputFluidContainer.class
	src/api/java/ic2/api/recipe/RecipeInputOreDict.class
	src/api/java/ic2/api/recipe/Recipes.class
	src/api/java/ic2/api/recipe/Recipes.java
	src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java
	src/main/java/mekanism/common/block/BlockMachine.java
	src/main/java/mekanism/common/tile/TileEntityFluidTank.java
	src/main/java/mekanism/common/util/SecurityUtils.java
	src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java
	src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java
2016-06-30 12:56:45 -04:00
aidancbrady 3b214376ba Implement config option for operators to bypass security, added turbine dump/dump excess functionality 2016-06-30 12:25:20 -04:00
aidancbrady 06e011e244 Packet crash fixes, fixed Seismic Reader crash, fixed Portable Teleporter interface crash, fixed teleport crash 2016-06-17 16:45:53 -04:00
aidancbrady e4aed3f7c1 Packets should be thread safe now 2016-06-17 15:56:22 -04:00
aidancbrady a5f4457677 Merge branch 'development' into 1.9.4
* development:
  Update pt_BR.lang
  Allow shift-right clicking machines with upgrades
  Fixed NBT reference losses
  Fixed Thermal Evaporation Controller computer integration
  Add config option for transmitter alloy upgrades
  Fixed transmitter crash, fixed entangloporter frequency issue, fixed PRC muffling upgrades

Conflicts:
	src/main/java/mekanism/client/render/RenderPartTransmitter.java
	src/main/java/mekanism/common/FluidNetwork.java
	src/main/java/mekanism/common/item/ItemAlloy.java
	src/main/java/mekanism/common/item/ItemUpgrade.java
	src/main/java/mekanism/common/util/PipeUtils.java
2016-06-15 20:41:32 -04:00
aidancbrady f29fe502a9 Add config option for transmitter alloy upgrades 2016-06-10 11:15:15 -04:00
aidancbrady eb7c2d1b78 Merge branch 'development' into 1.9.4
* development:
  Fixed Turbines unable to be formed in other dimensions
  Bump version to 9.0.2
  Fixed Personal Chest crash, bumped default Fuelwood Heater generation, added some null checks to prevent crashes
  Fixed outputting energy above Integer.MAX_VALUE to other mods, fixed tiered factories not supporting muffling upgrades, fixed boiler valve height interaction

Conflicts:
	src/main/java/mekanism/common/LaserManager.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/block/BlockMachine.java
	src/main/java/mekanism/common/entity/EntityFlame.java
	src/main/java/mekanism/common/tile/TileEntityBoilerValve.java
	src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
	src/main/java/mekanism/common/tile/TileEntityLaser.java
	src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java
	src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java
2016-05-28 02:34:55 -04:00
aidancbrady 38490db21d Fixed Personal Chest crash, bumped default Fuelwood Heater generation, added some null checks to prevent crashes 2016-05-28 02:01:21 -04:00
aidancbrady bba29e64bb Fixed server support, add fancy JEI crafting category items, fix transmitter internal retexturing, fixed SMP particles, fixed glass face culling, fixed laser beam render 2016-05-27 21:14:56 -04:00
aidancbrady ceec3e71e9 No more errors, the game launches, rejoice! 2016-05-26 03:14:44 -04:00
aidancbrady c6a09b5658 <1500 errors 2016-05-24 21:22:39 -04:00
aidancbrady 3983cc858b Begin the great port. 2378 errors to go! 2016-05-24 20:04:40 -04:00
aidancbrady ac7f2f9783 Remove unused commands in .obj and .mtl files, remove Electric Pump and Fluidic Plenisher TESRs 2016-05-19 00:22:20 -04:00
aidancbrady 8493e6f4d1 Begin overhauling TE renders. Certain blocks are gonna need to remain TESRs 2016-05-11 19:09:28 -04:00
aidancbrady 8b1017a3a8 Lots and lots of fancy rendering! 2016-05-11 17:42:51 -04:00
aidancbrady 730ee4e450 Loads and loads of render work. I can see the light at the end of the tunnel
- Finished CTM
- BasicBlock item rendering
- Balloon item rendering
- Plastic Fence item rendering
- Started work on Portable Tank fluid item rendering
- Fixed Obsidian TNT and Bin rendering
2016-05-10 15:38:12 -04:00
aidancbrady 3b75d9ff1e Loads of work on CTM, work on fixing multi blocks 2016-05-09 00:10:54 -04:00
aidancbrady c29e4ab9bc Work on rendering- need to figure out why flamethrower sound is getting cut off 2016-05-05 21:01:10 -04:00
Ben Spiers 5825c84fad Merge branch 'development' into 1.8.9 2016-04-27 23:47:00 +01:00
aidancbrady 1325b779b0 Prefilled Gas Tanks option 2016-04-25 17:43:11 -04:00
Ben Spiers 0cb18773aa Merge branch 'development' into 1.8.9 2016-04-25 16:08:06 +01:00
aidancbrady 2873c0c797 Added Fuelwood Heater, currently has no texture. After doing some server timing tests, the last thing we need to make efficient is the Formulaic Assemblicator 2016-04-23 17:09:01 -04:00
aidancbrady b97c6d8f4b Quantum Entangloporter model! 2016-04-22 23:15:18 -04:00
aidancbrady 982749bb47 Resistive Heater model, fixed Fusion Reactor 2016-04-14 15:54:52 -04:00
aidancbrady f904c8b80c Start integrating security into all machinery. This is a very rough implementation, there's gonna be a lot of balance and corrections to make before release 2016-03-21 16:53:29 -04:00
aidancbrady 062671cdc4 Added security desk 2016-03-21 08:15:49 -04:00
Ben Spiers 84336ec4d1 Merge branch 'development' into 1.8.9
Huge merge with 202 conflicts, hopefully not *too* broken.
2016-03-18 04:24:19 +00:00
aidancbrady a87b088be6 Work on Formulaic Assemblicator, also added some new fancy models from @CyanideX! 2016-03-14 23:57:37 -04:00
aidancbrady f8f8dfa737 More work on entangloporters 2016-03-04 13:14:48 -05:00
aidancbrady 4644e75202 Work on boiler stats panel, hopefully fix build 2016-03-01 10:22:24 -05:00
aidancbrady 1071f2fb4d Adjusted numbers, everything is now nice and balanced 2016-02-29 00:31:19 -05:00
aidancbrady c0f465d0cb Boiler rendering and interface, still yet to do statistics 2016-02-28 16:44:05 -05:00
aidancbrady 155758398c Continued boiler work 2016-02-28 11:52:52 -05:00
aidancbrady 87438dcc7f Boiler work, added heat info tab, worked on polishing heat interactions among machines 2016-02-27 13:32:48 -05:00
aidancbrady 9b9ed0a4c0 Polished resistive heaters, fixed a small bug in the sound system (a bit uncleanly) 2016-02-27 01:27:26 -05:00
aidancbrady 9d55f6cc8a Lots of work on resistive heaters, still mostly unfinished 2016-02-26 19:51:37 -05:00
aidancbrady 3c1496740c Tiered Gas Tanks and tiered Fluid Tanks! 2016-02-24 17:01:43 -05:00
Ben Spiers b08bca67d4 Merge branch 'v9' into 1.8.9 2016-02-20 22:19:34 +00:00
aidancbrady 84da514b54 Rename Solar Evaporation Plant to Thermal Evaporation Plant 2016-02-18 18:37:38 -05:00