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

649 commits

Author SHA1 Message Date
Aidan Brady
e848849ed8 Revert "Kill BuildCraft energy support once and for all, thanks to the excellent work of KingLemming." 
This reverts commit 1f2e792146.
 2013-12-03 06:57:53 -05:00
Aidan Brady
4ccd60f81d Fixed wire textures 2013-12-03 06:54:59 -05:00
Aidan Brady
360c980712 A bit of work on multipart 2013-12-02 23:44:34 -05:00
Aidan Brady
06b806e871 Add wildcard support to entire recipe system 2013-12-02 23:26:18 -05:00
Aidan Brady
47fd7799ff Fix up recipe system to accept wildcard blocks 2013-12-02 22:42:54 -05:00
Aidan Brady
a3fa18cb80 Remove superconductor, make Heat Gen cheaper 2013-12-02 22:35:46 -05:00
Aidan Brady
50b7870388 A few attempts to get multipart working. @unpairedbracket, I don’t know what the hell I’m doing, you’re gonna need to go over this. 2013-12-02 22:14:21 -05:00
Aidan Brady
5d8e21b776 Merge branch 'master' of https://github.com/aidancbrady/Mekanism into multipart-experimental-new 
Conflicts:
	common/mekanism/api/gas/GasNetwork.java
	common/mekanism/api/gas/GasTransmission.java
	common/mekanism/api/transmitters/DynamicNetwork.java
	common/mekanism/client/EnergyClientUpdate.java
	common/mekanism/client/FluidClientUpdate.java
	common/mekanism/client/GasClientUpdate.java
	common/mekanism/client/render/tileentity/RenderUniversalCable.java
	common/mekanism/common/EnergyNetwork.java
	common/mekanism/common/FluidNetwork.java
	common/mekanism/common/InventoryNetwork.java
	common/mekanism/common/Mekanism.java
	common/mekanism/common/item/ItemConfigurator.java
	common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java
	common/mekanism/common/tileentity/TileEntityMechanicalPipe.java
	common/mekanism/common/tileentity/TileEntityPressurizedTube.java
	common/mekanism/common/tileentity/TileEntityTransmitter.java
	common/mekanism/common/tileentity/TileEntityUniversalCable.java
	common/mekanism/common/util/CableUtils.java
	resources/assets/mekanism/textures/blocks/LiquidEnergy.png.mcmeta
 2013-12-02 21:45:40 -05:00
Aidan Brady
dc8a00a140 Fix a few issues 2013-12-02 21:37:11 -05:00
Aidan Brady
30237b34ac Delete old textures, add Copper and Tin blocks 2013-12-02 20:52:44 -05:00
Aidan Brady
c0c003a337 Fix a crash 2013-12-02 19:29:49 -05:00
Aidan Brady
1f2e792146 Kill BuildCraft energy support once and for all, thanks to the excellent work of KingLemming. 2013-12-02 19:19:23 -05:00
Aidan Brady
75cccf96a8 Slightly speed up Digital Miner 2013-12-02 18:54:21 -05:00
Aidan Brady
067c55491a Make deserts allow for 50% more solar generation 2013-12-02 18:38:18 -05:00
Aidan Brady
f81139a297 Update donators list :) 2013-12-02 18:32:12 -05:00
Aidan Brady
b75cbc5eaf Fix crash 2013-12-02 18:12:33 -05:00
Aidan C. Brady
57ffc071cf Fixed a crash and wire names 2013-12-02 17:11:39 -05:00
Aidan C. Brady
57caab2062 Wire fixes 2013-12-02 17:04:41 -05:00
Aidan C. Brady
d470ac1901 Some wire fixes 2013-12-02 16:39:43 -05:00
Aidan C. Brady
5c2c8e15cb Add in necessary models 2013-12-02 12:41:00 -05:00
Aidan C. Brady
054cba30e3 Wire code cleanup! 2013-12-02 12:27:57 -05:00
Aidan C. Brady
6781af7447 Clean up wire code, remove fancy furnace thing as I'm going to be implementing another form of a low-end generator soon 2013-12-02 12:18:38 -05:00
Aidan C. Brady
e38cf10ef6 Merge branch 'universal-wires' of https://github.com/aidancbrady/Mekanism 2013-12-02 11:42:21 -05:00
Aidan C. Brady
bb1dceb064 Fix up Copper and Tin dust smelting recipes. Most recommended build as of now. 2013-12-02 11:38:27 -05:00
Aidan C. Brady
e9c39bcf3d Fix ore gen 2013-12-02 11:32:45 -05:00
Aidan C. Brady
9290c76c05 Add custom Osmium Ore generation rates, generate Copper and Tin ores 2013-12-02 11:20:25 -05:00
Aidan C. Brady
20d3eb42b2 Add needed ingot recipes & textures 2013-12-02 09:24:52 -05:00
Calclavia
7396daa038 Re-enabled multipart 2013-12-02 21:41:17 +08:00
Calclavia
29741b999a Merge branch 'master' into universal-wires 2013-12-02 21:38:03 +08:00
Calclavia
11adb89791 Removed unnessary "instanceof" 2013-12-02 21:17:25 +08:00
Aidan C. Brady
1e51ddfa9a Add config option to override UE ratios 2013-12-02 07:59:52 -05:00
Aidan C. Brady
4a499d6dac Fix tank rendering, make Configurator serve as a BuildCraft wrench 2013-12-02 07:55:14 -05:00
Aidan Brady
5eba673468 Fixed Obsidian TNT render 2013-12-02 07:19:22 -05:00
Calclavia
41415ab683 Placed UE higher in priority for energy production 2013-12-02 20:16:53 +08:00
Aidan Brady
684e1d6718 Add OreDict registrations, fix charcoal block reverse crafting 2013-12-02 07:16:09 -05:00
Calclavia
07332ca245 Merge branch 'master' into universal-wires 
Conflicts:
	common/mekanism/induction/common/MekanismInduction.java
	resources/assets/mekanism/lang/en_US.lang
 2013-12-02 19:47:38 +08:00
Aidan Brady
e42ab62e2a Begin work on copper and tin ore and ingots :) 2013-12-01 21:58:35 -05:00
Aidan Brady
83bca26455 Remove Maganese Alloy in hopes for better balance, fixed several GUI color issues as well as Osmium Ore darkness 2013-12-01 17:45:19 -05:00
Aidan Brady
7ebd132b6e Fixed teslas, merged Electrostatic Linker into Configurator 2013-12-01 14:03:00 -05:00
Aidan Brady
f55d3ac874 Added Factory input slot distribution, configurable voice ports, fixed several bugs 2013-12-01 12:38:34 -05:00
Calclavia
c1d5e2bc60 Fixed non-multipart insulated wire texture 2013-12-01 18:05:27 +08:00
Calclavia
5865063fa0 Attempt to fix reflection InvocationTargetException 2013-12-01 17:39:22 +08:00
Calclavia
180401b8ef Forgot to print-stack-trace 2013-12-01 17:17:19 +08:00
Calclavia
a1ae16b82c Added console output for multipart disable 2013-12-01 17:08:19 +08:00
Calclavia
bf04c53415 Merge branch 'master' into universal-wires 2013-12-01 17:07:13 +08:00
Calclavia
a7a5248b24 Made logger set parent 2013-12-01 17:07:08 +08:00
Calclavia
3cca65f2cd Fixed non-multipart wire textures 2013-12-01 17:02:39 +08:00
Calclavia
57bcf19035 Fixed connecting to un-interfacable TE sides 2013-12-01 15:27:58 +08:00
Calclavia
ab32553c2d Added TE support for universal wires 2013-12-01 15:14:17 +08:00
Calclavia
7c79270259 Fixed multipart wire render 2013-12-01 14:50:06 +08:00
Calclavia
10bbcff077 Fixed Multipart wires not loading 2013-12-01 14:30:54 +08:00
Calclavia
4804f8f335 Merge branch 'master' into universal-wires 2013-12-01 13:58:18 +08:00
Calclavia
892cf8fb07 Fixed OreDict crashing due to loading before item/block initiation 2013-12-01 13:58:12 +08:00
Calclavia
f4d95a8129 Merge branch 'master' into universal-wires 2013-12-01 13:54:34 +08:00
Calclavia
7a2155c869 Made vanilla electric furnace load when Mekanism Generators is not loaded 2013-12-01 13:54:05 +08:00
Calclavia
43b4306f4b Got Induction module loading again 2013-12-01 13:51:33 +08:00
Calclavia
361d1ae380 Readded vanilla electric furnace but it's DISABLED by default 2013-12-01 13:50:02 +08:00
Calclavia
0205d7722e Readded universal wires into Mekanism Induction 2013-12-01 13:46:15 +08:00
Aidan Brady
4dec7c01ff Fixed OreDict integration 2013-12-01 00:29:08 -05:00
Calclavia
deaed38c50 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-12-01 13:23:48 +08:00
Calclavia
f560eb3c39 Moved OreDict to init phase 2013-12-01 13:23:27 +08:00
Aidan Brady
e562562661 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-12-01 00:16:04 -05:00
Aidan Brady
f853deb9c0 fixed API once again! :) 2013-12-01 00:15:52 -05:00
Calclavia
8588c90881 Added energy tablet to OreDict for external recipe usage 2013-12-01 13:09:12 +08:00
Aidan Brady
406be48069 Revert "Added energy tablet to OreDict for recipes" 
This reverts commit de4742e65c.
 2013-12-01 00:04:20 -05:00
Aidan Brady
36218ae086 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
commit de4742e65c.
 2013-12-01 00:04:08 -05:00
Aidan Brady
199ce13dcd Re-add EnumColor to API! 2013-12-01 00:03:40 -05:00
Calclavia
de4742e65c Added energy tablet to OreDict for recipes 2013-12-01 12:48:57 +08:00
Aidan Brady
5d949ec959 Fixed API for @micdoodle8 2013-11-30 23:19:24 -05:00
Aidan Brady
96d2a12948 Fixed that bug, @BevoLJ! 2013-11-30 13:06:44 -05:00
Aidan Brady
1be0d218af Final fix for now - fixed electric machine GUIs 2013-11-30 12:48:22 -05:00
Aidan Brady
2c754cd506 Merge GasUtils into GasTransmission 2013-11-30 12:37:47 -05:00
Aidan Brady
0715a890bd Fixed tank bug, thanks @Not_steve! Closes #553. 2013-11-30 12:34:18 -05:00
Aidan Brady
a4ab6db57b Fixes! 2013-11-30 12:29:49 -05:00
Aidan Brady
0c618a1cf3 Localization & gas fixes 2013-11-30 11:31:18 -05:00
Aidan Brady
14fb453bb8 Change the way UE integration works in Universal Cables 2013-11-30 01:28:40 -05:00
Aidan Brady
150c5dee0b Fix RF support 2013-11-30 01:02:44 -05:00
Aidan Brady
82933393c7 Fix a minor tank update issue 2013-11-30 00:47:11 -05:00
Aidan Brady
ba32a2b112 More localization support! 2013-11-30 00:43:54 -05:00
Aidan Brady
b224a01f39 Work on localization support, move around some API classes to make better compatibility 2013-11-30 00:28:02 -05:00
Aidan Brady
686cca5032 A few fixes and enhancements 2013-11-29 21:31:39 -05:00
Aidan Brady
0f61c5d50c A few fixes, and fancy Configurator GUI hovering! 2013-11-29 19:11:07 -05:00
Aidan Brady
30eff7f7fb Overthought something! 2013-11-29 18:22:43 -05:00
Aidan Brady
69d1c5961e Fix batteries 2013-11-29 18:19:18 -05:00
Aidan Brady
cd62f593fa Fix possible infinite loop 2013-11-29 17:37:00 -05:00
Aidan Brady
2e86b2a471 Better direct energy outputting 2013-11-29 17:17:01 -05:00
Aidan Brady
3d167922be Add IDeepStorageUnit support 2013-11-29 15:39:37 -05:00
Aidan Brady
65b305b27d Temp crash fix 2013-11-29 13:33:36 -05:00
Aidan Brady
20162970d8 Fixes! 2013-11-29 13:04:39 -05:00
Aidan Brady
82bae6e4bd Rendering fixes! 2013-11-28 22:20:24 -05:00
Aidan Brady
00b4c6f3e3 Rendering and transmitter performance enhancements, finish Rotary Condensentrator for the most part 2013-11-28 21:43:53 -05:00
Aidan Brady
ccae995242 Work on Rotary Condensentrator, fixed an issue with factories 2013-11-28 16:01:23 -05:00
Aidan Brady
ae580843aa Temp fix for electrolytic separator crash 2013-11-28 12:13:17 -05:00
Aidan Brady
3d1020d8dd Fix things! 2013-11-28 10:27:26 -05:00
Aidan Brady
fb3aa53eaf Fix several bugs! 2013-11-28 10:13:06 -05:00
Aidan Brady
98e864cd8d Work on that Rotary Condensentrator! 2013-11-27 23:42:54 -05:00
Aidan Brady
e06b8614a2 Fix Energy Cube inputting sides 2013-11-27 18:24:31 -05:00
Aidan Brady
419a295096 Work on Rotary Condensentrator, fix IC2 energy integration (mostly) 2013-11-27 18:17:44 -05:00
Aidan Brady
22fe896bcd Finish multi-ID machine support 2013-11-27 16:17:10 -05:00
Aidan Brady
96ba50a673 Many fixes! 2013-11-27 13:24:13 -05:00
Aidan Brady
6739d81a12 Miners are better for servers now. Please update! 2013-11-26 23:31:42 -05:00
Aidan Brady
b950960aea Dynamic Tanks are now 300% better. 2013-11-26 22:44:14 -05:00
Aidan Brady
dacc68e6c6 Gas API completely overhauled. Sorry @micdoodle8 :( 
General cleanup, pressurized tubes are 40 times more efficient, a few enhancements, Miners balanced.
 2013-11-26 20:11:26 -05:00
Aidan Brady
c2c4c4f93f Fixed Factory shift-click support 2013-11-25 18:44:52 -05:00
Aidan Brady
e2e7274cd6 Fix a few bugs. Signing off, see you all later! 2013-11-25 18:23:24 -05:00
Aidan Brady
e6016d7341 Fix item rendering in transporters 2013-11-25 18:10:21 -05:00
Aidan Brady
14259f2251 Last-minute recalculation for Diversion Transporters 2013-11-25 16:57:57 -05:00
Aidan Brady
028c6f8aea Fixed pixlepix’s diversion transporter 2013-11-25 16:50:55 -05:00
Aidan Brady
19feb2e602 Fixes by the dozen 2013-11-25 16:34:59 -05:00
Aidan Brady
824817cef5 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-11-25 13:33:52 -05:00
Aidan Brady
0b70ed5dcc Work on an overhaul of the Logistical Transporter network. Don’t use, completely untested. 2013-11-25 13:33:42 -05:00
Calclavia
79354580b1 Added TE compatibility to multimeter 2013-11-25 19:18:24 +08:00
Aidan Brady
d0253444c1 Tiny cleanup, off to bed. Tomorrow I implement a more advanced transporter system. 2013-11-25 00:14:56 -05:00
Aidan Brady
a360255f63 Greatly improve performance of transmitter networks, improved logistics of Mechanical Pipe 2013-11-25 00:00:26 -05:00
Aidan Brady
c10ba92522 Connected Dynamic Glass textures :) 2013-11-24 19:30:52 -05:00
Aidan Brady
38d9bdd1d2 Start work on a connected texture renderer, remove old textures, fix recipes for Vaygrim’s issue (closes #481) 2013-11-24 18:54:11 -05:00
Aidan Brady
bd701fb546 Made all factories show up in NEI 2013-11-24 18:04:45 -05:00
Aidan C. Brady
591c6592a4 Fix delayed side setting with Sorter 2013-11-24 17:40:27 -05:00
Aidan C. Brady
7c47043d37 A few minor enhancements 2013-11-24 16:35:01 -06:00
Aidan C. Brady
fea5e8dab7 Pressurized Tubes now render gas in connected block bounds dynamically 2013-11-24 16:01:35 -06:00
Aidan C. Brady
afae26f9b8 Rendering enhancements! Mechanical Pipes now function better and use the large Transmitter model. 2013-11-24 15:44:16 -06:00
Aidan C. Brady
59b945a33f Fixed Model3D textures, fixed error spam on world load, fixed Digital Miner breaking blocks on top, general code cleanup 2013-11-24 12:12:42 -06:00
Aidan C. Brady
de3ee34743 FIxed ObsidianTNT mapping 2013-11-24 08:27:52 -06:00
Aidan C. Brady
dfda7547cc Fix Obsidian Ingot recipe 2013-11-24 08:19:50 -06:00
Aidan C. Brady
d5af842037 Fix a few bugs in Factory and Configuration GUI 2013-11-24 07:53:14 -06:00
Aidan C. Brady
009ee3a885 Add shift-click support and configurable usage to Digital Miner 2013-11-23 21:25:37 -06:00
Aidan C. Brady
dca7663de9 Fix factories 2013-11-23 15:21:01 -05:00
Aidan C. Brady
a27582971b Neatened up Diversion Transporter code 2013-11-23 15:01:18 -05:00
Aidan C. Brady
a848b11582 Fixed crash with Electrolytic Separator 2013-11-23 14:44:28 -05:00
Aidan
5b690e9bfb Merge pull request #461 from pixlepix/master 
Logistical Diverter
 2013-11-23 11:44:03 -08:00
Aidan C. Brady
22c07254fd Purification, Compressing, and Combining factories :) 2013-11-23 14:36:50 -05:00
Aidan Brady
4a5df9f922 Fixed tesla texture 2013-11-23 10:42:23 -05:00
pixlepix
45b449078c Added CC peripheral support for digital miner 2013-11-23 09:04:05 -05:00
pixlepix
dc1743d517 Divertion transporter fixes, including name change 2013-11-23 07:28:01 -05:00
pixlepix
51225ba715 Logistical diverter texture 2013-11-23 07:28:01 -05:00
pixlepix
2ecb10cbca Added Logistical Diverter 2013-11-23 07:28:01 -05:00
Aidan Brady
4c68aa2ca2 Fix machines being able to be placed facing up or down 2013-11-23 00:23:56 -05:00
Aidan Brady
2ef3b1be6c Make that miner require a robit! 2013-11-23 00:10:57 -05:00
Aidan Brady
f5d620b6a0 Fix sorter auto-orient 2013-11-23 00:01:44 -05:00
Aidan Brady
10da5406de RF! :D 2013-11-22 23:36:18 -05:00
Aidan C. Brady
a9fde31c97 Fix client/server item accepting issue on contractor 2013-11-22 21:25:06 -05:00
Aidan C. Brady
0adc0dc75e Attempt to use my own unit system 2013-11-22 20:58:49 -05:00
Aidan C. Brady
a3d200291c GUI work... 2013-11-22 20:39:44 -05:00
Aidan C. Brady
649f128d76 Work on textures 2013-11-22 20:27:27 -05:00
Aidan C. Brady
cc46bebc43 Teslas are FIXED! :) 2013-11-22 20:00:18 -05:00
Aidan C. Brady
e44519dc7d A ton of bug fixes, working on fixing teslas 2013-11-22 19:32:06 -05:00
Aidan C. Brady
dc925798b0 Hopefully fixed crash 2013-11-22 12:09:04 -05:00
Aidan C. Brady
df70da8bd0 Fix another crash 2013-11-22 07:34:03 -05:00
Aidan Brady
ace1365d0f Aw yeah! Better GUI packets for Miner. Heading to bed guys, see ya tomorrow! 2013-11-21 22:30:01 -05:00
Aidan Brady
0e2d2917d1 Remove Capacitor and Empty Capacitor, fix mouses, made sorter and miner maintain configuration 2013-11-21 21:37:03 -05:00