tilera/IndustrialWires
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Commit graph

  • 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 malte0811 2017-06-23 17:40:49 +0200
  • 5f8ef84e0f Merge branch 'MC1.11' into marx malte0811 2017-06-23 17:33:13 +0200
  • c262866b4d Build 1.5-11 Fixed some Z-fighting on the Variacs malte0811 2017-06-17 17:50:16 +0200
  • e9a2ade95a Allowed multiple components on the same panel network to modify the same RS signal Cleaned up RS output code for panel components Removed IC2's maven from build.gradle, since it is currently offline malte0811 2017-06-17 17:22:44 +0200
  • 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) malte0811 2017-06-16 22:04:30 +0200
  • 56f9852acc Cleaned up a merge conflict in en_US.lang Wasn't there some sort of joke about programming languages where merge conflicts are still valid code? malte0811 2017-06-16 09:47:19 +0200
  • d65621a0b5 Redstone control, other misc Marx generator details malte0811 2017-06-09 11:37:23 +0200
  • 206c1170f1 Merge branch 'MC1.11' into marx malte0811 2017-06-05 17:23:18 +0200
  • 963755af78 Wire connections and bounding boxes for the Marx generator Some misc stuff malte0811 2017-06-03 21:06:25 +0200
  • d4bed0d324 Added a render for the Marx generator malte0811 2017-06-02 17:57:17 +0200
  • 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 malte0811 2017-05-25 17:49:06 +0200
  • b9f5a8a9f8 Added (analog) panel meters Fixed locks breaking the model cache Ported the fix for #7 malte0811 2017-05-27 17:00:26 +0200
  • 42c1021c88 Build 1.4-10 Removed a copyright header that Intellij put in build.gradle malte0811 2017-05-26 17:33:09 +0200
  • 6c6a72ae03 Minor fixes to the previous commits malte0811 2017-05-26 17:02:07 +0200
  • 0dd80c3e56 Added a key ring, holds up to 10 keys by default texture might change, docs+recipe still to do malte0811 2017-05-20 18:50:04 +0200
  • 9ba2dcb0b6 Added textures for the key+lock switch Renaming a key to an empty name returns it to its unnamed state malte0811 2017-05-20 17:14:43 +0200
  • 65ba8acbec Finished up the lock switch, just missing textures now Added a recipe to copy settings from one panel component to another Some internal changes malte0811 2017-05-19 17:45:30 +0200
  • b11ca376a3 Fixes for the previous commits malte0811 2017-05-26 13:26:15 +0200
  • 55e03ab8a4 Started adding locks for panels malte0811 2017-05-18 18:13:08 +0200
  • fe7c44f298 Added some IC2 items to the Engineer's toolbox malte0811 2017-05-15 21:40:43 +0200
  • 0c52514b15 Glowing components like the indicator light actuall glow in the dark now Some bugfixes Complete code reformatting malte0811 2017-05-11 16:39:20 +0200
  • 0f0232469e Fixed energy loss when not transmitting any energy, closes #7 malte0811 2017-05-26 12:31:19 +0200
  • 8e845ab100 Added a key ring, holds up to 10 keys by default texture might change, docs+recipe still to do malte0811 2017-05-20 18:50:04 +0200
  • 695679caa2 Added textures for the key+lock switch Renaming a key to an empty name returns it to its unnamed state malte0811 2017-05-20 17:14:43 +0200
  • 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 malte0811 2017-05-19 17:45:30 +0200
  • 5165d55218 Started adding locks for panels malte0811 2017-05-18 18:13:08 +0200
  • d3cd816f0c Added some IC2 items to the Engineer's toolbox malte0811 2017-05-15 21:40:43 +0200
  • 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 malte0811 2017-05-13 20:13:40 +0200
  • 23c1afc44b Glowing components like the indicator light actuall glow in the dark now Some bugfixes Complete code reformatting malte0811 2017-05-11 16:39:20 +0200
  • 06d8ddfff9 Merge remote-tracking branch 'origin/master' into MC1.11 malte0811 2017-05-10 17:56:23 +0200
  • 01c2e58409 Updated to MC 1.11, part 1 Compiles and runs, but probably doesn't really work yet malte0811 2017-05-10 17:56:05 +0200
  • 7eecdea794 Build 1.4-8 Added the missing textures Fixed a few minor bugs master malte0811 2017-05-10 13:20:00 +0200
  • aca048cbee Added recipes for all panel related things Apart from the missing textures everything is ready for a release dev malte0811 2017-05-09 17:25:03 +0200
  • c680f9a466 Added manual entries for control panel related things Fixed some problems when playing on a dedicated server malte0811 2017-05-08 21:29:45 +0200
  • 7cc0d9d9fe Added toggle switches, including a version with a cover to prevent accidental activation malte0811 2017-05-08 17:20:04 +0200
  • bf66a0fdc7 Added a variable transformer/Variac to put on control panels malte0811 2017-05-03 18:08:52 +0200
  • 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 malte0811 2017-05-01 18:40:29 +0200
  • 6717e7c815 Added a model for the panel creator malte0811 2017-04-29 18:54:21 +0200
  • 4e84a0d020 Added an item model for the control panel Added some localization&other item models malte0811 2017-04-28 20:20:52 +0200
  • c15e68a716 Added textures for the panel component items Made it possible to pick up single components from the panel creator GUI malte0811 2017-04-27 18:15:11 +0200
  • d02981e14d Added models for the RS panel connector Fixed every block dropping the meta=0 version malte0811 2017-04-24 17:26:42 +0200
  • 3739fc127c Stopped the user from placing overlapping components Fixed GUI String rendering size Fixed panel components not stacking in some situations Slider length has to be greater than 0.125 now malte0811 2017-04-23 17:23:10 +0200
  • 0327322198 Added editing GUI's for the other components fixed a potential component dupe bug malte0811 2017-04-22 18:14:49 +0200
  • 1d83fa7579 Added a GUI for editing panel components Currently only available for buttons malte0811 2017-04-20 20:44:08 +0200
  • 8cabaa9844 Added textures for the panel creator GUI and the control panel block Fixed bounding box direction on the Jacob's ladders malte0811 2017-04-17 19:35:14 +0200
  • 0ee914b7e6 Further work on panel creation Added items to represent the panel components malte0811 2017-04-13 17:14:05 +0200
  • ee827b46ef Started implementing a GUI for creating control panels fixed the default value for euPerIf, closes #6 malte0811 2017-04-12 15:55:37 +0200
  • 4bda8d458c fixed a crash on dedicated servers because for some reason AABB(Vec3d, Vec3d) is client-only fixed copyright comments malte0811 2017-04-10 16:20:39 +0200
  • 838e9c2af4 Control panels now drop properly and can be placed added a basic GUI to panel RS connectors to allow changing the ID malte0811 2017-04-09 16:59:57 +0200
  • 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) malte0811 2017-04-04 17:07:45 +0200
  • 3641775ff5 Control panels now work when connected to multiple RS ports with the same ID fixed rotation of Jacob's Ladders malte0811 2017-04-02 17:16:42 +0200
  • 4ecab259dd More misc control panel stuff Includes RS indicator lights malte0811 2017-04-01 17:33:58 +0200
  • 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! malte0811 2017-03-28 18:15:41 +0200
  • 34bf534b1c started adding control panels. Very much WIP! malte0811 2017-03-24 17:40:05 +0100
  • 4a4360c98b Fixed invalid connections being possible, see BluSunrize/ImmersiveEngineering#1975 malte0811 2017-03-21 18:16:21 +0100
  • b36e5c2623 General refactoring, IC2 connectors no longer use BlockIEBase! malte0811 2017-03-21 18:12:09 +0100
  • 12e18534fe Fixed broken textures on the mechanical converters/motor with Chisel installed, closes #5 malte0811 2017-03-07 16:51:47 +0100
  • c3d871aa37 Build 7 fixed the Jacob's Ladders breaking when trying to rotate them fixed sharp rendering edges inside "salted" arcs malte0811 2017-03-06 16:36:02 +0100
  • 59177870f1 added the manual entry on jacobs ladders fixed jacobs ladders replacing other blocks on placement malte0811 2017-03-03 19:04:08 +0100
  • a15107025d Jacobs ladders cause damage when touched applying salt to Jacobs ladder's colors the arc orange (due to sodium) malte0811 2017-03-03 17:52:22 +0100
  • 7c9d8ff8fb added textures for the jacobs ladders fixed the normal sized ladder missing a bit of rendering limited energy input to the side marked as such malte0811 2017-03-02 17:26:24 +0100
  • 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 malte0811 2017-02-28 17:32:40 +0100
  • 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... malte0811 2017-02-26 13:56:36 +0100
  • a113a3d608 added some methods needed for new IE versions chaged forge version to use to latest malte0811 2017-02-21 17:38:15 +0100
  • 3d9f199d66 Build 6 Potentially fixed missing textures/models on the mechanical converters in some cases? Fixed "old" connectors with full storage not working malte0811 2017-01-11 09:54:46 +0100
  • 0e613d05b8 reduced the difference between IC2's wires and IndustrialWires's cables to prevent machines from blowing up when they shouldn't (There are still differences in some cases, but it works in most cases) added a "credits" file malte0811 2017-01-04 18:18:33 +0100
  • ca41e82576 Merge pull request #3 from SihenZhang/master malte0811 2016-12-24 09:22:10 +0100
  • 52135edd44 Update zh_CN.lang Sihen Zhang 2016-12-24 11:24:45 +0800
  • 09ec25e59d Merge remote-tracking branch 'refs/remotes/malte0811/master' Sihen Zhang 2016-12-23 22:55:32 +0800
  • caa1c060ce Create zh_CN.lang Sihen Zhang 2016-12-23 22:52:50 +0800
  • 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 malte0811 2016-12-20 17:05:20 +0100
  • 04e25e300c made rotation work with mechanical converters added recipes for the mechanical converters changed them to accept forge energy as well as IF malte0811 2016-12-19 18:16:46 +0100
  • 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 malte0811 2016-12-15 21:32:28 +0100
  • 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 malte0811 2016-12-13 21:00:07 +0100
  • 3bd6c14266 Build 4 added a config option for wire length per item and per connection malte0811 2016-12-08 18:16:58 +0100
  • 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! malte0811 2016-12-08 17:52:34 +0100
  • ba2bec5d95 Build 3: reduced the amount of calls to BlockIEBase, I want to get stop using that class at some point fixed missing localization for the creative tab changed build.gradle to automatically download the latest version of IC2 malte0811 2016-10-28 08:26:20 +0200
  • c6c0bb00c9 added a license: GPL3 added a changelog changed build.gradle to automatically download IC2 added Curse as a valid IC2 download location malte0811 2016-09-29 16:19:16 +0200
  • 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 malte0811 2016-09-22 19:52:01 +0200
  • d8bbbb8170 initial commit malte0811 2016-09-15 20:43:18 +0200