Calclavia
22e69669f3
Merge branch 'master' into multipart-experimental
...
Conflicts:
src/resonantinduction/ResonantInduction.java
2013-09-22 11:08:00 +08:00
Ben Spiers
0b5f5c470c
Refine some colours: pink was too light, brown was nearly white and cyan was... not cyan
2013-09-22 01:47:11 +01:00
Ben Spiers
f53c129c10
Add obj models to fix weird rendering.
2013-09-22 01:47:11 +01:00
Ben Spiers
095355418a
Stop them from always dropping wool. derp.
2013-09-22 01:47:10 +01:00
Ben Spiers
81778cebb6
Make networks form when loaded.
...
That was so annoying, feel like there should be a way of doing this with tile entities, but hey, I've always said multiparts are nicer to work with than vanilla block/tiles
2013-09-22 01:47:10 +01:00
Calclavia
c57ea54f85
Added copper wire oredict support
2013-09-21 23:34:05 +08:00
Calclavia
39edccc54b
Updated to Minecraft 1.6.4
2013-09-21 11:20:39 +08:00
Calclavia
7435e4b348
Version bump
2013-09-21 11:01:25 +08:00
Calclavia
21ec04da42
Started work on injecting new furnace tile class in...
2013-09-21 10:54:03 +08:00
Calclavia
3a5fe66adb
Fixed double HTTP
2013-09-21 10:39:59 +08:00
Calclavia
b1bf9be852
Fixed double HTTP derp
2013-09-21 10:31:18 +08:00
Calclavia
2708ed87dd
Merge branch 'master' into multipart-experimental
2013-09-21 10:29:51 +08:00
Calclavia
825687ac1f
Updated build script for Forge MultiPart
2013-09-21 10:29:31 +08:00
Ben Spiers
eb6fddd839
Useful while I'm debugging
2013-09-20 04:00:10 +01:00
Ben Spiers
e0877af41b
Fix insulation and redstone signals having no effect other than visual.
...
I'm not sure that it worked before I started but it's fixed now anyway.
2013-09-20 03:59:37 +01:00
Ben Spiers
e6fdacc8f0
Allow shearing insulation off wires
2013-09-20 03:57:32 +01:00
Ben Spiers
9697763856
Move the neighbor update to PartAdvanced
2013-09-20 03:56:44 +01:00
Ben Spiers
397bf28db2
Apply new interfaces to old tileentity so they work nicely together
2013-09-19 21:12:30 +01:00
Ben Spiers
50b3414788
Use EnumWireMaterial more in PartWire, apply material interface.
2013-09-19 21:01:37 +01:00
Ben Spiers
1017308d47
Material Interfaces
2013-09-19 21:00:35 +01:00
Ben Spiers
7f110bed7a
This is starting to come together pretty nicely:
...
* Works with unmodified UE. THANKS CB!
* Multiple wire materials again (only via /get for now)
* Icons on multiwire item
* IInsulation. Maybe integrate up to UE when this is done?
* Drops items
* Proper clientsyncing
* Probably more, I forget
2013-09-19 20:18:50 +01:00
Ben Spiers
900d823fde
And add the stuff to the mod
2013-09-17 04:28:27 +01:00
Ben Spiers
9ee8691858
For some reason.
2013-09-17 04:28:26 +01:00
Ben Spiers
a3b37b2b95
For debugging
2013-09-17 04:28:26 +01:00
Ben Spiers
4ba7492601
Start work on multipart integration. Needs some edits to UE to not crash when placing a wire next to an old wire.
...
Won't PR to UE yet in case CB can apply a fix for it to stop it being an issue. Might push the UE changes to my github.
2013-09-17 04:25:09 +01:00
Calclavia
7d996229d7
Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction
...
Conflicts:
src/resonantinduction/tesla/TileEntityTesla.java
2013-09-13 18:21:35 +08:00
Calclavia
e27a6a1f5c
Fixed inconsistant Tesla electric bolt
2013-09-13 18:20:54 +08:00
Calclavia
7ec588d529
Fixed inconsistant Tesla electric bolt
2013-09-13 18:20:33 +08:00
Calclavia
20e864b1e0
Fixed outputting BuildCraft power if UE network is detected
2013-09-13 18:07:42 +08:00
Calclavia
a9e27ec097
Fixed #22 - Wires connecting to non-power BuildCraft pipes
2013-09-13 17:16:05 +08:00
Calclavia
7d57f983e0
Attempt to fix render battery crash
2013-09-08 19:58:19 +08:00
Calclavia
e2a1b5c08a
Added Mekanism universal cable conversion recipe
2013-09-07 23:24:48 +08:00
Calclavia
2305c7ed47
Updated German translation thanks to Vexatos
2013-08-31 18:13:28 +08:00
Calclavia
dc3a6e7b87
Added basic BuildCraft support for wires
2013-08-29 20:28:31 +08:00
Calclavia
cd936af1ec
Updated UE to for wires to work with IC2 machines
2013-08-27 21:49:19 +08:00
Calclavia
1b8ed1d8b8
Got multimeter working with IC2 and BuildCraft machines
2013-08-27 21:48:31 +08:00
Calclavia
02c44613d4
Made battery GUI display precise units
2013-08-25 21:05:38 +08:00
Calclavia
a7b94b483f
Fixed #24 - Wires not working with furnace
2013-08-25 21:00:30 +08:00
Calclavia
7c07ab9436
Some work on wire furnace burn time
2013-08-25 17:55:48 +08:00
Calclavia
c72b57cc34
Fixed #8
2013-08-25 17:48:52 +08:00
Calclavia
9c4cf9d727
Fixed #18 - Furnace wire crash
2013-08-25 17:46:05 +08:00
Calclavia
d66e4dca9a
Fixed #17 - Tesla not transfering power
2013-08-25 17:41:41 +08:00
Calclavia
d3bcfd9a0a
Added infinite capacitors
2013-08-25 17:31:27 +08:00
Calclavia
258a479d38
Added IC2 interchangeable recipes
2013-08-25 17:15:00 +08:00
Calclavia
8f4427d14c
Added insulation and colored wires
2013-08-25 16:59:52 +08:00
Calclavia
b19963a050
Got multimeter working with wires
2013-08-24 20:00:33 +08:00
Calclavia
4eede3ad02
Added transfer threshold to battery
2013-08-24 19:46:08 +08:00
Calclavia
2a6d12da8c
Prepared wire for insulation render; still need a model
2013-08-24 19:32:28 +08:00
Calclavia
ab0c625a88
Updated German translation thanks to Vexatos once again!
2013-08-24 19:31:44 +08:00
Calclavia
8cee88502b
Added ability to toggle wire ticking via shift-right-click
2013-08-23 21:31:05 +08:00