Commit graph

34 commits

Author SHA1 Message Date
malte0811 311a498a90 Finished the separated energy inputs/outputs. Textures will need to change since they get blocked by most pipes/connectors 2018-06-16 23:08:38 +02:00
malte0811 3d2865aa93 Basic separated energy inputs/outputs for MechMB's 2018-06-16 19:15:15 +02:00
malte0811 b65cdc6fbe General cleanup 2018-05-26 18:46:40 +02:00
malte0811 b7bc55a0a9 A lot of bugfixes, also new models and textures for some of the parts 2018-03-27 21:31:03 +02:00
malte0811 1fb01d9abd Started adding 4-phase stuff 2018-03-23 16:27:32 +01:00
malte0811 8cca1b13e1 Added the commutator, the essential part for medium-power conversion
Also, textures! Some are s**t, esp the one for the magnet ring
2018-02-28 21:03:26 +01:00
malte0811 23df4324ec Mechanical MB's disassemble properly now
Started implementing mechanical failure (currently only for flywheels)
Changed the waveforms. This is supposed to be efficient!
2018-02-17 20:37:53 +01:00
malte0811 8d98e30b04 More mech MB work
This is getting somewhere!
2018-02-13 19:23:02 +01:00
malte0811 d3508e42fe More TMP commits 2018-02-02 17:20:53 +01:00
malte0811 6c60b4562b Merge branch 'MC1.12' into mechStuff 2018-02-01 20:56:12 +01:00
malte0811 ff3c391ac5 Added a discharge meter, a device that can measure the energy in a Marx discharge
Also some experimental stuff for wire coils
2018-01-28 21:30:53 +01:00
malte0811 58692ceb76 TMP commit 2018-01-01 20:07:20 +01:00
malte0811 c8c2b5bf88 Lots of small fixes for the Marx generator
Includes mirrored models. TODO: Recalculate normals for default models to fix lighting differences
2017-09-04 22:04:53 +02:00
malte0811 bc1ebc9fa5 Add JEI support for the Marx generator 2017-08-29 21:31:22 +02:00
malte0811 c18d94899a Change the structure of the Marx generator to not include IC2 blocks
Finish up the texture/model
Fix some bugs where the energy storage goes negative and starts charging the marx to -Infinity V
2017-08-13 18:46:46 +02:00
malte0811 c53b09b6ce Merge branch 'MC1.12' into marx
# Conflicts:
#	build.gradle
#	src/main/java/malte0811/industrialWires/IndustrialWires.java
#	src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityPanel.java
#	src/main/java/malte0811/industrialWires/blocks/hv/BlockJacobsLadder.java
#	src/main/java/malte0811/industrialWires/blocks/hv/TileEntityJacobsLadder.java
#	src/main/java/malte0811/industrialWires/client/ClientProxy.java
#	src/main/java/malte0811/industrialWires/client/render/TileRenderJacobsLadder.java
#	src/main/java/malte0811/industrialWires/controlpanel/PanelComponent.java
2017-08-06 18:15:08 +02:00
malte0811 92b00f199c Started adding single-component panel blocks. Very WIP 2017-07-12 20:20:11 +02:00
malte0811 b716c23e3d Added a way to create tilted panels in-game (no recipe yet)
Panels are no longer created from machine casings, but from unfinished panels
2017-06-30 21:04:43 +02:00
malte0811 963755af78 Wire connections and bounding boxes for the Marx generator
Some misc stuff
2017-06-03 21:06:25 +02:00
malte0811 5a80b2626b Marx generator. It forms and breaks
Models for mirrored marx generators are broken
The IC2 cables drop as items due to missing IC2 API methods
2017-06-01 11:44:07 +02:00
malte0811 01c2e58409 Updated to MC 1.11, part 1
Compiles and runs, but probably doesn't really work yet
2017-05-10 17:56:05 +02:00
malte0811 4586e57b84 Control panels can be disassembled in the panel creator now
added the missing background textures
changed the "base item" for control panels to be a basic machine casing
2017-05-01 18:40:29 +02:00
malte0811 6717e7c815 Added a model for the panel creator 2017-04-29 18:54:21 +02:00
malte0811 4e84a0d020 Added an item model for the control panel
Added some localization&other item models
2017-04-28 20:20:52 +02:00
malte0811 d02981e14d Added models for the RS panel connector
Fixed every block dropping the meta=0 version
2017-04-24 17:26:42 +02:00
malte0811 8cabaa9844 Added textures for the panel creator GUI and the control panel block
Fixed bounding box direction on the Jacob's ladders
2017-04-17 19:35:14 +02:00
malte0811 b1ff95cf85 Further work on control panels
RS output is working (but depends on current master IE with an additional fix)
Model rotation on Jacobs ladders is broken!
2017-03-28 18:15:41 +02:00
malte0811 34bf534b1c started adding control panels. Very much WIP! 2017-03-24 17:40:05 +01:00
malte0811 8a12144490 Progress on the jacobs ladders:
added models for the small and normal sized versions
made them rotatable
fixed sound
energy storage is saved to NBT now
2017-02-28 17:32:40 +01:00
malte0811 2edc831d19 added Jacobs Ladders, part 1
rendering and sound are done, as well as energy usage
ToDo: finish the dimensions of the different ladders, add models for small+normal, recipes, probably a lot more...
2017-02-26 14:04:23 +01:00
malte0811 3d9f199d66 Build 6
Potentially fixed missing textures/models on the mechanical converters in some cases?
Fixed "old" connectors with full storage not working
2017-01-11 16:40:54 +01:00
malte0811 d3c571d60c added textures for the mechanical converters+IF motor, made by C8H8O4
fixed some minor bugs with energy conversion rates
increased the default maximum of kinetic to rotational energy conversion, the old one was equal to about 2 IF
added a manual entry, still need to change the displayed recipes
2016-12-15 21:32:28 +01:00
malte0811 1fee68c9ef changed wires to use different amounts of cable for different length connections
added Glass Fiber Wire
changed the amount of connectors/relays produced per crafting
WARNING: this commit won't work with the public IE builds currently available
2016-09-22 20:32:38 +02:00
malte0811 d8bbbb8170 initial commit 2016-09-16 16:47:59 +02:00