tilera/IndustrialWires
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
129 commits 14 branches 0 tags 2.9 MiB
Commit graph

48 commits

Author SHA1 Message Date
malte0811 f4884d23ba Build 1.6-21 
Updated README.md+screenshot
Fixed the Marx generator not charging properly off an EU supply
Fixed the IE version detection. Stupid Java optimized out the field access to the version String since it's static final
 2017-10-22 20:02:41 +02:00
malte0811 746a5d1b57 Improved rendering of the Marx generator in the manual 
The mach converter entry isn't duplicated any more
 2017-10-21 21:15:01 +02:00
malte0811 cc14d20595 Added shaders for the Marx generator and the Jacob's ladder 2017-10-10 18:31:32 +02:00
malte0811 e9449440fd Build 1.6-20 
Fix some Marx crashes on dedicated servers
Fix wires attached to MG's sometimes not rendering
Fix issues with tinnitus when setting volume to 0
 2017-09-15 20:03:23 +02:00
malte0811 67562ef296 Remove TE's that don't need to tick from the ticking TE list 
Use IE uranium if IC2 isn't installed
 2017-09-13 21:32:19 +02:00
malte0811 8d4c0fcad2 Merge branch 'marx' into MC1.12 2017-09-04 17:42:50 +02:00
malte0811 ac7d36b5e7 Add documentation on the Marx generator 
Add a command to get/set/regenerate the marx energy factor
 2017-09-03 20:48:10 +02:00
malte0811 2b3bad1149 Add signing info 2017-09-02 17:20:57 +02:00
malte0811 685a9058f6 Allow CT to remove marx recipes 2017-08-29 22:01:51 +02:00
malte0811 bc1ebc9fa5 Add JEI support for the Marx generator 2017-08-29 21:31:22 +02:00
malte0811 96aa3ec96a Add CraftTweaker support for the Marx generator 2017-08-27 22:45:52 +02:00
malte0811 840869cd08 Fix some bugs&crashes when IC2 isn't installed 
Some general cleanup
 2017-08-23 22:30:24 +02:00
malte0811 ccc3c7ab12 IC2 is an optional dependency now, probably still buggy 
Fix the TE names
 2017-08-22 18:33:05 +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 5667768420 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-07 22:03:07 +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 6f6edab7b1 IW's items show up in the creative search now 
Coil length crafting now leaves the correct coil behind if the length is over the maximum
 2017-07-10 20:30:18 +02:00
malte0811 9ee44021bc Update to 1.12: Recipes 
The recipe book is quite inconsistent about NBT...
 2017-07-10 17:59:43 +02:00
malte0811 d0472b45b9 Update to 1.12: Everything except recipes done. Probably quite buggy 2017-07-09 18:10:06 +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 143311aecf Effects of Marx discharges on entities: 
Damage for thos close to the discharge, tinnitus for those further out
Also added a nice bang for discharges (it is from a cap bank rather than a Marx though)
 2017-06-16 22:04:30 +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 695679caa2 Added textures for the key+lock switch 
Renaming a key to an empty name returns it to its unnamed state
 2017-05-20 17:14:43 +02:00
malte0811 6a2ce4685b Finished up the lock switch, just missing textures now 
Added a recipe to copy settings from one panel component to another
Some internal changes
 2017-05-19 17:45:30 +02:00
malte0811 5165d55218 Started adding locks for panels 2017-05-18 18:13:08 +02:00
malte0811 d3cd816f0c Added some IC2 items to the Engineer's toolbox 2017-05-15 21:40:43 +02:00
malte0811 6d4c4f7276 Added a remapper to stop wire connectors from vanishing when updating 
They will be facing north though, so most of them will have to be broken and replaced
 2017-05-13 20:13:40 +02:00
malte0811 23c1afc44b Glowing components like the indicator light actuall glow in the dark now 
Some bugfixes
Complete code reformatting
 2017-05-11 16:39:20 +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 aca048cbee Added recipes for all panel related things 
Apart from the missing textures everything is ready for a release
 2017-05-09 17:25:03 +02:00
malte0811 7cc0d9d9fe Added toggle switches, including a version with a cover to prevent accidental activation 2017-05-08 17:20:04 +02:00
malte0811 1d83fa7579 Added a GUI for editing panel components 
Currently only available for buttons
 2017-04-20 20:44:08 +02:00
malte0811 0ee914b7e6 Further work on panel creation 
Added items to represent the panel components
 2017-04-13 17:14:05 +02:00
malte0811 4bda8d458c fixed a crash on dedicated servers because for some reason AABB(Vec3d, Vec3d) is client-only 
fixed copyright comments
 2017-04-10 16:20:39 +02:00
malte0811 838e9c2af4 Control panels now drop properly and can be placed 
added a basic GUI to panel RS connectors to allow changing the ID
 2017-04-09 16:59:57 +02:00
malte0811 3d4c2ef1f4 Added sliders to control panels, they can be used to set an RS signal between 0 and 15 
Commented out the IE gradle dependency since no maven build of IE works with control panels yet (latest master does though)
 2017-04-04 17:11:50 +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 59177870f1 added the manual entry on jacobs ladders 
fixed jacobs ladders replacing other blocks on placement
 2017-03-03 19:04:08 +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 f13b944c7a Build 5 
made the option to disable converters actually do something
made wire coils show when they are out of range, mirroring the bahavior of IE coils in the latest dev version
 2016-12-20 17:27:09 +01:00
malte0811 04e25e300c made rotation work with mechanical converters 
added recipes for the mechanical converters
changed them to accept forge energy as well as IF
 2016-12-19 18:16:46 +01:00
malte0811 ac390872b1 Added basic (low efficiency, low power) conversion methods between RF and EU by making conversion between IE rotational energy and IC2 kinetic energy possible 
TODO:
-textures+blockstate JSON's
-recipes
-manual entry including an explanation of rotational energy
-ask Blu about making inputRotation return a double of leftover energy
 2016-12-13 21:00:07 +01:00
malte0811 24ea23c2b1 fixed a weird edgecase (probably in forge or vanilla) causing a lot of log spam, closes #1 
moved all wire-related classes into a seperate sub-package, in preparation for energy conversion blocks
removed a warning from ClientProxy. IndustrialWires does not generate any warnings when compiling now!
 2016-12-08 18:16:19 +01:00
malte0811 c6c0bb00c9 added a license: GPL3 
added a changelog
changed build.gradle to automatically download IC2
added Curse as a valid IC2 download location
 2016-09-29 16:26:03 +02: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