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 |
|
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 |
|
Aidan Brady
|
5f2545d8e8
|
A few fixes and new mechanics
|
2013-11-21 20:31:28 -05:00 |
|
Aidan Brady
|
41eda67517
|
Fixed miner filter issue.
|
2013-11-21 19:37:13 -05:00 |
|
Aidan
|
c9ea74b013
|
Merge pull request #451 from pixlepix/master
Made robit look up on chargepad
|
2013-11-21 16:36:33 -08:00 |
|
pixlepix
|
72909b7657
|
Made robit look up on chargepad?
|
2013-11-21 19:27:39 -05:00 |
|
Aidan Brady
|
f53153cfd4
|
ANOTHER donator? Whoa! Thanks so much Greylocke :)
|
2013-11-21 19:17:32 -05:00 |
|
Aidan Brady
|
b7c7f58f2c
|
Fix up Robit pickup AI, and update donator cape list! Thanks ejmiv89! :)
|
2013-11-21 19:06:22 -05:00 |
|
Aidan Brady
|
6ff12e2c81
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-21 18:57:17 -05:00 |
|
Aidan Brady
|
85ad41df74
|
Fixed teslas!
|
2013-11-21 18:57:07 -05:00 |
|
pixlepix
|
1e2603d5fb
|
Added Robit Item Pickup.
|
2013-11-21 18:51:22 -05:00 |
|
Aidan Brady
|
57c16a0916
|
Don’t replace furnaces, that was for ModJam
|
2013-11-21 18:31:15 -05:00 |
|
Aidan Brady
|
25f1a72a16
|
Active management for that Miner.
|
2013-11-21 18:29:22 -05:00 |
|
Aidan Brady
|
323690ffdb
|
Hopefully fixed tesseract outputting
|
2013-11-21 17:19:59 -05:00 |
|
Aidan Brady
|
796a5aa397
|
Fixed IC2/TE support.
|
2013-11-21 16:50:40 -05:00 |
|
Aidan C. Brady
|
d01d444753
|
This miner is pretty much done :)
|
2013-11-21 16:29:22 -05:00 |
|
Aidan C. Brady
|
1c674f4317
|
Some bounding block inventory management
|
2013-11-21 16:04:14 -05:00 |
|
Aidan C. Brady
|
68f3d28119
|
Bounding blocks for miner!
|
2013-11-21 14:35:33 -05:00 |
|
Aidan Brady
|
44ca9d1067
|
Start work on bounding blocks
|
2013-11-21 08:44:59 -05:00 |
|
Aidan Brady
|
890de9446b
|
Model positioning fixes! Next is lasers and/or multiblock!
|
2013-11-20 21:17:23 -05:00 |
|
Aidan Brady
|
34f300cf6f
|
Begin implementing that sexy model
don’t recommend this build for personal use
|
2013-11-20 20:28:06 -05:00 |
|
Aidan Brady
|
8ce5876200
|
Some new logistics, preparing for model
|
2013-11-20 19:36:39 -05:00 |
|
Aidan Brady
|
222ce67e83
|
Miner kinda works!
|
2013-11-20 18:51:45 -05:00 |
|
Aidan Brady
|
e33775fec9
|
Fix tiny filter issue
|
2013-11-20 18:28:09 -05:00 |
|
Aidan Brady
|
1f3a82c3f0
|
Miner work! Starting on actual operation algorithms.
|
2013-11-20 18:17:10 -05:00 |
|
Aidan C. Brady
|
789c5dbf45
|
Some work on algorithm
|
2013-11-20 16:12:54 -05:00 |
|
Aidan C. Brady
|
7b3edc142e
|
GUI and networking fixes - I think the GUI is finished.
|
2013-11-20 15:15:02 -05:00 |
|
Aidan C. Brady
|
9673b9c7f8
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-20 11:01:27 -05:00 |
|
Aidan C. Brady
|
14d557cbe5
|
Some work on things, got rid of version constants, they're supposed to differ per module.
|
2013-11-20 11:01:13 -05:00 |
|
Calclavia
|
f8e7363483
|
Fixed multimeter packet update
|
2013-11-20 21:23:42 +08:00 |
|