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

46 commits

Author SHA1 Message Date
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
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
a732ffa6a9 Remove manual entries if IC2 isn't loaded 2017-09-02 18:03:16 +02:00
malte0811
e200185235 Add a separate sound for Marx misfirings 
Add a texture for the tinnitus potion effect
 2017-08-27 20:27:29 +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
505464c002 Discharges can fail if the total voltage is too low 
Added Albedo compat for the marx generator
 2017-08-15 21:37:53 +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
74c0115102 Added documentation on the key ring and fixed some bugs with it 2017-07-13 17:53:05 +02:00
malte0811
d0472b45b9 Update to 1.12: Everything except recipes done. Probably quite buggy 2017-07-09 18:10:06 +02:00
malte0811
7dc33fb296 Finished up tilted panels: 
-Some Bugfixes
-Added recipes and documentation
 2017-07-02 20:37:47 +02:00
malte0811
cbac269e04 Updated mappings to match the ones used by IE 2017-06-25 18:34:10 +02:00
malte0811
9ae4bad8b6 Misc Marx stuff: 
-The bottom cap charges faster now
-Tinnitus can be replaced by damage or nausea in the config file
-If the first cap is charged higher than the charging voltage it will only be discharged if the yellow signal is 0
-Improved handling of low stored power
 2017-06-23 17:40:49 +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
206c1170f1 Merge branch 'MC1.11' into marx 2017-06-05 17:23:18 +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
d4bed0d324 Added a render for the Marx generator 2017-06-02 17:57:17 +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
b9f5a8a9f8 Added (analog) panel meters 
Fixed locks breaking the model cache
Ported the fix for #7
 2017-05-27 17:02:18 +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
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
c680f9a466 Added manual entries for control panel related things 
Fixed some problems when playing on a dedicated server
 2017-05-08 21:29:45 +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
c15e68a716 Added textures for the panel component items 
Made it possible to pick up single components from the panel creator GUI
 2017-04-27 18:15:11 +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
1d83fa7579 Added a GUI for editing panel components 
Currently only available for buttons
 2017-04-20 20:44:08 +02:00
malte0811
ee827b46ef Started implementing a GUI for creating control panels 
fixed the default value for euPerIf, closes #6
 2017-04-12 15:55:37 +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
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
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
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
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
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