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

704 commits

Author SHA1 Message Date
Aidan C. Brady
5d742ce200 Teleporters are actually worth it now. 2013-12-07 23:02:25 -05:00
Aidan Brady
c2737ff064 Work on things, may be unstable 2013-12-07 17:06:11 -05:00
Aidan Brady
5e50e920a6 Add potion resistance to gas mask 2013-12-07 00:55:35 -05:00
Aidan Brady
916859c21d Added description text to machines 2013-12-06 20:03:25 -05:00
Aidan C. Brady
84ab705170 Start work on new description system, UNSTABLE BUILD 2013-12-06 16:44:08 -05:00
Aidan C. Brady
cb9900bbc7 Work on gas masks/scuba gear stuff 2013-12-06 15:26:44 -05:00
Aidan C. Brady
f982eb851c Remove now-unused generics 2013-12-06 07:57:26 -05:00
Aidan Brady
ecfe9a43b9 Fixes! 2013-12-06 07:26:48 -05:00
Aidan Brady
c282965fee Complete merge 2013-12-05 22:39:54 -05:00
Aidan Brady
d36409f4b0 Merge branch 'master' into multipart-experimental-new 
Conflicts:
	common/mekanism/client/model/ModelJetpack.java
	common/mekanism/client/render/ModelCustomArmor.java
	common/mekanism/common/Mekanism.java
	common/mekanism/common/item/ItemJetpack.java
	common/mekanism/common/tileentity/TileEntityUniversalCable.java
	common/mekanism/induction/client/render/RenderWire.java
	common/mekanism/induction/common/tileentity/TileEntityMultimeter.java
	common/mekanism/induction/common/tileentity/TileEntityWire.java
	common/mekanism/induction/common/wire/PartUniversalConductor.java
	common/mekanism/induction/common/wire/PartWire.java
 2013-12-05 22:37:27 -05:00
Aidan Brady
449822fef2 Fixed build 2013-12-05 22:33:28 -05:00
Aidan Brady
9c0358b38e Removed multimeter 2013-12-05 22:03:36 -05:00
Aidan Brady
c3a985f273 Kill off wires for the last time, fix up jetpacks 2013-12-05 21:10:15 -05:00
Aidan Brady
fb350e43f0 Cool stuff! 2013-12-05 16:42:00 -05:00
Aidan C. Brady
a204df448f Work on jetpacks 2013-12-05 15:50:38 -05:00
Aidan Brady
73c41f7863 Sorters can now directly eject into inventories 2013-12-04 22:17:56 -05:00
Aidan Brady
b84445c9ea Smarter Logistical Transporter future insert calculation 2013-12-04 22:04:51 -05:00
Aidan Brady
6cc198cf0b Bins are nice to hoppers now. 2013-12-04 21:55:56 -05:00
Aidan Brady
38dda1d18e Fix name, add a few more particle effects 2013-12-04 20:01:27 -05:00
Aidan Brady
64f681c263 Jetpack work! 2013-12-04 19:14:27 -05:00
Aidan Brady
aca0692cec Fix a few jetpack things 2013-12-04 17:22:00 -05:00
Aidan Brady
bf9d48d86f Work on jetpacks - specifically networking fixes and sounds! 2013-12-04 16:53:58 -05:00
Aidan C. Brady
2914a4201d Fix a few bugs, work on jetpack networking 2013-12-04 15:43:03 -05:00
Aidan Brady
91eafd02aa Fixed IC2 tiers 2013-12-04 07:19:43 -05:00
Aidan Brady
82f7b0f761 Work on jetpack 2013-12-04 07:16:28 -05:00
Aidan Brady
7182d07cbd Bugfixes and the beginnings of jetpacks! 2013-12-03 23:36:06 -05:00
Aidan Brady
a228c659cd Remove RecipeLoader 2013-12-03 21:57:03 -05:00
Aidan Brady
1cfdd805f3 Work on jetpack 2013-12-03 21:49:12 -05:00
Aidan Brady
e9b18c1a35 Cleanup 2013-12-03 18:00:06 -05:00
Aidan Brady
8f4ac31871 Minor cleanup 2013-12-03 17:46:48 -05:00
Aidan Brady
f492ff7ee9 Hopefully fixed ENet crash with IC2 2013-12-03 16:57:57 -05:00
Aidan Brady
afe85f9215 Fix some pesky bugs and crashes 2013-12-03 16:56:03 -05:00
Aidan C. Brady
54fa437cb1 A few fixes 2013-12-03 16:50:00 -05:00
Aidan C. Brady
a45a6e43f3 Fix solar generation 2013-12-03 16:23:45 -05:00
Aidan C. Brady
b60d6c172f Fix pressurized tube render 2013-12-03 16:23:08 -05:00
Aidan C. Brady
ef8b6c1c78 Fix gas render in mech pipe 2013-12-03 11:24:23 -05:00
Aidan C. Brady
7956748e8f Fix connections 2013-12-03 11:16:30 -05:00
Aidan C. Brady
a4d1b191e9 Re-add BC stuff 2013-12-03 11:10:14 -05:00
Aidan C. Brady
5e9a282eff A few fixes 2013-12-03 11:07:03 -05:00
Aidan C. Brady
9a4147ab7c Add TE and UE support to multipart cables 2013-12-03 11:03:03 -05:00
Aidan C. Brady
5dc8d2fc80 Multipart work 2013-12-03 10:54:50 -05:00
Aidan C. Brady
09b3a98a2a Work on multipart 2013-12-03 08:42:13 -05:00
Aidan Brady
934d537230 Fix a few issues 2013-12-03 07:18:40 -05:00
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
3d01d103ae Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-12-02 09:24:58 -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
53604dd4b3 Updated UE API 2013-12-02 21:37:58 +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
Aidan Brady
f9d845a36b Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-12-02 07:19:03 -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
Calclavia
0ad768a3ef Updated UE API 2013-12-02 19:45:20 +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
cf792366f6 Merge branch 'master' into universal-wires 2013-12-01 14:41:10 +08:00
Calclavia
f17982f85d Updated UE API 2013-12-01 14:41:01 +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