Commit graph

1140 commits

Author SHA1 Message Date
Calclavia f227c706da Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-02-23 16:07:08 +08:00
Calclavia d857b45d30 Improved battery and charger render 2014-02-23 16:06:35 +08:00
Alex_hawks a69932dd1c NEI Plugin 2014-02-23 16:04:43 +08:00
Calclavia 55458ff82a Added new awesome battery model thanks to CyanideX! 2014-02-23 14:26:05 +08:00
Calclavia 6a5d2fe37b Fixed #260 - Fluid material color null crash 2014-02-22 20:39:38 +08:00
Calclavia 3e20c039bb Fixed tesla electricity reception 2014-02-22 19:43:25 +08:00
Calclavia adc21a724a Added new textures for detector and thermopile 2014-02-22 19:08:31 +08:00
Calclavia 31c44b5c57 Fixed framed wire not checking canConnect 2014-02-22 11:47:41 +08:00
Calclavia 8a4509feac Fixed #254 - Some mixer issues 2014-02-21 22:48:55 +08:00
Calclavia cbaf9884e6 Fixed #247 - Transformer not transferring energy 2014-02-21 22:11:35 +08:00
Calclavia 97064eab72 Fixed pipes not connecting 2014-02-21 20:32:58 +08:00
Calclavia 85a074e1a9 Levitator now functions properly 2014-02-21 19:48:16 +08:00
Calclavia 0f15e6d1fa Added config to disable auto-generated materials 2014-02-21 17:07:39 +08:00
Calclavia d3e7347ac1 Multimeter now implements PartFace 2014-02-21 17:00:34 +08:00
Calclavia 642806b5c5 Made electromagnetic levitator multipart 2014-02-20 23:14:53 +08:00
Calclavia b72fb66ea8 Fixed charger packet and function 2014-02-20 22:30:08 +08:00
Calclavia 53124c1800 Electric charger is now a multipart 2014-02-20 19:11:30 +08:00
Calclavia b0e77b7a40 Fixed #246 - Transformer connections 2014-02-20 18:18:18 +08:00
Calclavia c1ce38ffbb Added prefab partFace 2014-02-20 17:51:14 +08:00
Calclavia ba7d489c50 Finished levitator render 2014-02-20 17:25:07 +08:00
Calclavia 4e15eb36ac Added new electromagnetic levitator model 2014-02-20 13:21:50 +08:00
DarkGuardsman 0d3001b3fc Possible fixed for icon call server side in framed wire 2014-02-19 21:24:08 -05:00
Calclavia 5db13056dd Clean up 2014-02-19 21:38:04 +08:00
Calclavia 8d29ff451e Reorganized model files 2014-02-19 21:35:42 +08:00
Calclavia 3d83fd0452 Moved some renderer to use Techne loader 2014-02-19 17:38:24 +08:00
Calclavia 99e8cd7992 Added renderer for mixer 2014-02-19 10:51:22 +08:00
Calclavia b421273726 Fixed channels not updating on world load 2014-02-19 09:57:25 +08:00
Calclavia 5630fd0d3d Fixed some blocks not in creative menu 2014-02-18 22:31:12 +08:00
Calclavia 3bdef52169 Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-02-18 21:12:12 +08:00
Calclavia 915a2663ee Added hover highlight for multimeter and shaft placement 2014-02-18 21:11:59 +08:00
DarkGuardsman db8f2546f7 Minor changes to fluid channel code 2014-02-18 08:04:47 -05:00
Calclavia dd37a14a0c Updated to UE 3.1.0 2014-02-18 20:01:09 +08:00
Calclavia 98361f4c28 Fixed troughs not creating a tile 2014-02-18 19:30:58 +08:00
DarkGuardsman 692f2bd97e Little bit more work on pipes channel 2014-02-17 22:40:23 -05:00
DarkGuardsman b35a1d29a5 Started on pipe channels aka troughs 2014-02-17 22:25:34 -05:00
Calclavia 4bce8a8fe0 Removed unused textures and reorganized model folder 2014-02-17 22:10:44 +08:00
Calclavia 90720d4009 Added and improved firebox textures 2014-02-17 22:00:24 +08:00
Calclavia 8a9e3bda51 Fixed pipe rendering 2014-02-17 19:14:35 +08:00
Calclavia 327c78d0a6 Added new pipe texture, model messed up 2014-02-16 22:57:41 +08:00
Calclavia 1cbfa10eea New textures for metal caster 2014-02-16 21:30:23 +08:00
Calclavia 0358d65ee1 Added connected textures to solar panel 2014-02-16 21:00:58 +08:00
Calclavia cee4358aae Added millstone top texture 2014-02-16 17:52:59 +08:00
Calclavia 697d432f36 Added texture for millstone 2014-02-16 17:45:50 +08:00
Calclavia 466f5b0839 Multimeter now works with fluids 2014-02-15 23:52:01 +08:00
Calclavia 6031f8181f Made all modules sub-mods 2014-02-13 20:10:23 +08:00
Calclavia b5f710992e Removed IReadOut in favor of IInformation 2014-02-13 16:12:57 +08:00
Calclavia fcb78c6a4a Finished modularization 2014-02-13 16:05:27 +08:00
Calclavia daf896fa85 Begin modularization 2014-02-13 12:42:56 +08:00
Calclavia 2ffbbf559b Fixed #220 - Grinding wheel MP crash 2014-02-11 15:50:13 +08:00
Calclavia be5d2bd90c Now registering tile packets 2014-02-11 08:45:52 +08:00
Calclavia 08adc8756e Fixed levitator not ray tracing for collision and rotation 2014-02-10 20:29:27 +08:00
DarkGaurdsman b337c7a5b8 Charger now works 2014-02-08 05:25:46 -05:00
DarkGaurdsman 9b1fa08fe9 Fixed charger item render position 2014-02-08 04:45:32 -05:00
DarkGaurdsman 788d39da02 Moved charger render to correct package 2014-02-08 04:13:16 -05:00
Calclavia a08f665dd1 Fixed some grinding wheel rotation direction 2014-02-08 13:12:37 +08:00
Calclavia 9d0fbdb272 Fixed gear ratio and gear connection around corners 2014-02-08 12:25:45 +08:00
Calclavia c8e9e58761 Fixed #212 - Some configs not being read 2014-02-08 11:01:05 +08:00
Calclavia b10125b4d9 Fixed #198 - EM Levitator not rendering beams properly 2014-02-07 23:53:52 +08:00
Calclavia daf6736445 Some unfinished work on gear connection logic 2014-02-06 15:57:25 +08:00
Calclavia d359e6b46b Polished gear placement, grid now renders for gear placing 2014-02-06 15:14:17 +08:00
Calclavia 506e3bbeba Some gear ratio fixes 2014-02-06 13:38:04 +08:00
Calclavia b40e54afc8 Fixed battery not resetting their transfer rates 2014-02-06 13:17:21 +08:00
Calclavia e1b0163159 Prevented no power torque/angular velocity 2014-02-06 13:04:57 +08:00
Calclavia 2e9873d940 Fixed #206 - Gear connection on edge 2014-02-06 12:52:39 +08:00
Calclavia 2845be6bdf Fixed stone and metal gear dropping as wooden 2014-02-06 11:45:45 +08:00
Calclavia bb6ea3f92d Large gears now use shift-click to be constructed 2014-02-06 11:43:11 +08:00
Calclavia 9d959cb779 Fixed flat wire on face not receiving energy 2014-02-06 01:05:28 +08:00
Calclavia 0e7e770350 Moved some render to Calclavia Core 2014-02-06 00:04:21 +08:00
Calclavia 8b6ce6427e Updated Calclavia Core 2014-02-05 23:06:16 +08:00
Calclavia b0d97743e3 Fixed #207 - Gears not having subtypes 2014-02-05 13:37:37 +08:00
Calclavia 82e03d45fd Some turbine fixes and tweaks 2014-02-05 13:06:05 +08:00
Calclavia dcfdb7ad03 Fixed a multimeter multipart crash 2014-02-05 11:33:58 +08:00
Calclavia 10c2794e35 Removed unused classes 2014-02-05 11:20:45 +08:00
Calclavia 805dfe3db0 Added gear crank sound 2014-02-05 01:08:10 +08:00
Calclavia 223edc92ec Fixed up wind turbine angular velocity 2014-02-05 00:54:51 +08:00
Calclavia c357c500d2 Added temporary renderer for water turbine 2014-02-05 00:35:21 +08:00
Calclavia 50ff13dfa3 Made direction of wind turbine more specific 2014-02-05 00:30:07 +08:00
Calclavia f5d002c126 Using new block and item loading system 2014-02-05 00:19:41 +08:00
Calclavia 5ac68f9a8d Refactored RecipeUtils to RecipeResource 2014-02-04 22:52:42 +08:00
Calclavia e04b1d1004 Attempt to fix some linking issues 2014-02-04 18:57:15 +08:00
Calclavia 43754c4163 Flipped gear wrench control 2014-02-04 17:30:04 +08:00
Calclavia 567faa366f Added wind turbine rendering for new model 2014-02-04 13:42:58 +08:00
Nick Owens 5e994add1d added metal turbine model (full list of parts icm)
LargeBlade
LargeBladeArm
LargeHub
LargeMetalBlade
LargeMetalHub
SmallBlade
SmallHub
2014-02-03 19:47:46 -05:00
Nick Owens b3a62f86e1 models for "turbines" (part names in full commit msg)
Here are the part names:
LargeBlade
LargeBladeArm
LargeHub
SmallBlade
SmallHub
2014-02-03 19:14:46 -05:00
Calclavia e99a9f1c33 Increase superconductor max transfer amperage 2014-02-04 00:26:18 +08:00
Calclavia f49a3736b8 Nerfed battery 2014-02-03 14:14:29 +08:00
Calclavia 639efc4eb5 Update Calclavia Core 2014-02-03 13:36:27 +08:00
Calclavia 6219747cb2 Updated Calclavia Core 2014-02-03 13:09:29 +08:00
DarkGuardsman c643397864 Got items to render in the charger 2014-02-02 17:15:41 -05:00
DarkGuardsman bbe840e49f Worked on charger renderer, and improved RenderItemOverlayTile 2014-02-02 16:34:02 -05:00
DarkGuardsman dc21d12c76 Added charger to registry, finished block bounds for charger 2014-02-02 15:13:18 -05:00
Calclavia 67fbfd239b Fixed battery drop and pick block 2014-02-03 00:25:22 +08:00
Calclavia 941398fa29 Balanced out battery a bit 2014-02-02 23:58:31 +08:00
Calclavia a7d6c94590 Disabled different pipe types until it gets worked on 2014-02-02 23:41:53 +08:00
Calclavia 9dc8824e4d Added water turbine 2014-02-02 20:22:04 +08:00
Calclavia 58c0017d13 Less dust block on the firebox takes less energy to heat 2014-02-02 19:27:47 +08:00
DarkGuardsman 50ae6db1cf Started on item charging panel 2014-02-02 02:51:55 -05:00
Calclavia 1f0612c0d4 Fixed multimeter merging in wrong direction 2014-02-02 14:16:50 +08:00
Calclavia 961d6630cd Mixer now works 2014-02-02 13:49:03 +08:00
Calclavia fb1d6d54b0 Fixed bronze dust not registered in OreDict 2014-02-02 12:21:33 +08:00
Calclavia b733de2ec8 Some fixes to resource generator 2014-02-02 12:14:40 +08:00
Calclavia cc980f26bf Made firebox heating energy dependent on biome temperature 2014-02-02 11:58:02 +08:00
Calclavia f31ce8a841 Some pipe network tweaks 2014-02-02 11:18:32 +08:00
Calclavia 73c82146c4 Firebox now accepts lava fluid 2014-02-02 00:20:44 +08:00
Calclavia b53af54bac More minor fixes to the colors 2014-02-01 13:42:45 +08:00
Calclavia 9ccee1addc Fixed TileMaterial loading colors before texture loads 2014-02-01 13:33:32 +08:00
Calclavia 4c940c1949 Initiate set up for the mixture fluid tile 2014-02-01 12:55:50 +08:00
Calclavia 51356b5958 Clean up and reformat 2014-02-01 12:08:38 +08:00
Calclavia 19b7c37a84 Started some rework on the mixer 2014-02-01 12:07:22 +08:00
Calclavia 5dbc7e1cb5 Revert "Temporarily disabled mixer for upcoming rewrite"
This reverts commit d0b0a34a31.
2014-02-01 11:56:04 +08:00
Calclavia 39d73b5634 Revert "Minor clean up"
This reverts commit 428b187722.
2014-02-01 11:55:55 +08:00
Calclavia 428b187722 Minor clean up 2014-01-31 23:08:30 +08:00
Calclavia d0b0a34a31 Temporarily disabled mixer for upcoming rewrite 2014-01-31 22:43:10 +08:00
Calclavia 0562b19dc8 Some generator and wind turbine render fixes 2014-01-31 21:31:47 +08:00
Calclavia 510135601e Fixed firebox electrical usage and pick block 2014-01-31 19:55:23 +08:00
Calclavia 4d0e45c3c7 Fixed #177 - Gear shaft powering gear without touching it 2014-01-31 19:19:09 +08:00
Calclavia 8d22221c5d Removed electric hot plate. Added electric firebox 2014-01-31 19:14:36 +08:00
Calclavia d6a9b3e69a Fixed some more multimeter renders 2014-01-31 18:59:17 +08:00
Calclavia 2a858059b4 Multimeters now display torque and angular velocity 2014-01-31 18:45:33 +08:00
Calclavia 84b13c027c Fixed luma color in ResourceGenerator 2014-01-31 18:14:30 +08:00
Calclavia 9380b03dc0 Some more work on the multimeter 2014-01-31 12:01:06 +08:00
Calclavia d2bb7b870d Added ability to display capacity with multimeter 2014-01-31 11:27:09 +08:00
Calclavia 0178cb0b73 Fixed #184 - Items on engineering table not rendering in fast graphics 2014-01-31 10:53:51 +08:00
Calclavia 38fe2fbe65 Prevented multimeter to be placed down 2014-01-31 10:44:08 +08:00
Calclavia fe5d49b910 Fixed #187 - Ore dictionary crash 2014-01-31 10:37:54 +08:00
Calclavia 223cbf9c80 Oops, left something out 2014-01-31 01:45:28 +08:00
Calclavia 15c44d5ef0 Fixed #176 - Generator only outputting in one side 2014-01-31 01:36:20 +08:00
Calclavia c7d4525a9c Fixed #180 - Multimeter glitchy rendering 2014-01-31 01:29:56 +08:00
Calclavia 9acebbba76 Fixed some shaft directions 2014-01-31 00:21:06 +08:00
Calclavia bffc3e4fd5 Fixed grinder rotation and packets 2014-01-31 00:10:13 +08:00
Calclavia 2cb30f501b Dusts now fall 2014-01-30 23:32:00 +08:00
Calclavia 46b43a9de8 Minor conveyor belt and gear shaft fixes 2014-01-30 23:24:39 +08:00
Calclavia 5de21946a2 Fixed multimeter item rendering 2014-01-30 22:54:35 +08:00
Calclavia fc0f5c2011 Transformer can now change its multiplier with shift-wrench 2014-01-30 22:35:32 +08:00
Calclavia adf6fd9127 Fixed up transformer render 2014-01-30 22:27:54 +08:00
Calclavia 98dc4cd0f0 Fixed dust block pick block and drops 2014-01-30 22:18:51 +08:00
Calclavia 813ba4e167 Fixed gears not showing their material name 2014-01-30 21:59:45 +08:00
Calclavia 5725a99501 Fixed #181 - Rubble not stacking properly 2014-01-30 21:47:45 +08:00
Calclavia 2671882e04 Fixed a invalid rubble crash 2014-01-30 20:36:55 +08:00
Calclavia 74bfb96976 Fixed #174 - Solar panel breaking texture 2014-01-30 20:32:50 +08:00
Calclavia a298d8eedb Fixed #179 - Right clicking engineering table with item 2014-01-30 20:32:03 +08:00
Calclavia 62ce220dae Some work on the wind turbine 2014-01-30 20:25:26 +08:00
Calclavia bc09bc6ca8 Added initial wind turbine 2014-01-30 16:17:05 +08:00
Calclavia ad89f41a58 Made gear and shaft placement and bounds more intuitive 2014-01-30 00:46:28 +08:00
Calclavia 158091519f Added tiers for gears: stone and iron gear 2014-01-30 00:15:54 +08:00
Calclavia daff7a091f Got multimeter energy value rendering 2014-01-29 23:57:41 +08:00
Calclavia a6c5eb6d72 Connected texture logic now working 2014-01-29 23:45:45 +08:00
Calclavia 5189633823 Multimeter screens now render 2014-01-29 22:42:37 +08:00
Calclavia 8b8d2b9ee7 Multimeters now have a network 2014-01-29 21:57:03 +08:00
Calclavia 356edf9b62 Multimeter now renders connected textures 2014-01-29 21:35:16 +08:00
Calclavia 411c3b8161 Some work on graphs 2014-01-29 13:36:27 +08:00
Calclavia 47834c5e15 Started incomplete work on the multimeter screen 2014-01-29 12:54:20 +08:00
Calclavia 4887997646 Added small battery energy loss and multimeter tweaks 2014-01-29 12:16:54 +08:00
Nick Owens ce3feb0e67 forgot texture for windings 2014-01-28 22:05:30 -05:00
Nick Owens a57c87d757 Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-28 22:02:57 -05:00
Nick Owens fa1a24d196 poly count of tranformer models reduced.
names of windings changed to have "Box" appended

Full list of current parts:

InnerWindingConnector
InnerWindingHighBox
InnerWindingLowBox
InnerWindingMedBox
InsulatorLayerHigh
InsulatorLayerLow
InsulatorLayerMed
OuterWindingConnector
OuterWindingHighBox
OuterWindingLowBox
OuterWindingMedBox
base
core
2014-01-28 22:00:11 -05:00
Calclavia 6d28d34969 Some improvements to the metal caster 2014-01-29 10:41:57 +08:00
DarkGuardsman 67a4f21dec Started on fluid motor, and hydraulic pressure 2014-01-28 17:11:46 -05:00
DarkGuardsman a15ed12159 Added some overloads to BlockIOBase 2014-01-28 16:37:11 -05:00
Calclavia c1e6a6eb6e Added metal caster 2014-01-29 00:18:56 +08:00
Calclavia a1b0747ba6 Tweaked color generator and molten metals 2014-01-28 23:30:54 +08:00
Calclavia 9a580564fb Added molten textures 2014-01-28 22:53:53 +08:00
Calclavia 22f75bf48d Added dust block and melting dusts into fluids 2014-01-28 22:42:12 +08:00
Calclavia af4ce9b93c Fixed turntable messing up multipart 2014-01-28 21:08:09 +08:00
Calclavia 4acf402225 Fixed mixture fluids not showing their color 2014-01-28 20:48:19 +08:00
Calclavia 053236fa1f Some fixes to linking 2014-01-28 17:26:40 +08:00
Calclavia c37abd0ee5 Now only boiling source blocks 2014-01-28 16:17:22 +08:00
Calclavia f2275bf689 Firebox can now boil water above it into steam 2014-01-28 16:12:10 +08:00
Calclavia a0ec8a83c0 Fixed setVelocity null point exception 2014-01-28 15:45:23 +08:00
Calclavia 84f2a90c02 Fixed gear shaft inverting rotation 2014-01-28 14:46:38 +08:00
Calclavia ef4322338e Fixed gear shaft external connections 2014-01-28 14:29:48 +08:00
Calclavia 05b903f07b Fixed gear shaft rendering rotation 2014-01-28 14:11:03 +08:00
Calclavia 17108484f9 Added gear shaft 2014-01-28 13:42:52 +08:00
Calclavia 73ddd6ff18 Added recipes to almost everything 2014-01-28 12:59:33 +08:00
Calclavia abcbb00280 Added recipes to almost everything 2014-01-28 12:29:51 +08:00
Calclavia ef6190cf13 Fixed detector texture 2014-01-28 11:54:29 +08:00
Calclavia 8a9ad49d61 Fixed gear not sending packets and disabled encoder 2014-01-28 11:52:19 +08:00
Calclavia 7d468cb614 Improved gear model 2014-01-28 10:46:28 +08:00
Calclavia ee5c3a773e Fixed #164 - ItemOreResource crash 2014-01-28 10:30:49 +08:00
DarkGuardsman 9f99aefb35 Minor change in turntable vector call 2014-01-27 13:54:14 -05:00
Calclavia ab3815bd0a Added thermopile 2014-01-28 00:29:33 +08:00
Calclavia ee0f2d216d Added millstone 2014-01-28 00:00:21 +08:00
Calclavia 5ad8643350 Added dust and refined dust smelting recipes 2014-01-27 23:23:44 +08:00
Calclavia 2e36f323e6 Added manual ore dust washing with cauldron 2014-01-27 23:06:47 +08:00
Calclavia f69f928cc0 Moved infinite blocks to Calclavia Core 2014-01-27 22:46:48 +08:00
Calclavia 7d2f3ec6d2 Made hammer smashing a "crusher" process 2014-01-27 22:28:45 +08:00
Calclavia 50e1c192f8 Added names to different machine decorative blocks 2014-01-27 22:24:13 +08:00
Calclavia 216dd08bef Moved some prefabs to Calclavia Core 2014-01-27 22:09:56 +08:00
Calclavia 3bf6a6e20a Updated to new GUI base classes 2014-01-27 20:26:25 +08:00
Calclavia e7cc0f992a Minor tweaks and changes to mixer 2014-01-27 12:57:15 +08:00
Calclavia 9c3700382f Some minor work on the filter 2014-01-27 01:02:16 +08:00
Calclavia 56ab302f0e Finished up large gears! 2014-01-26 20:55:33 +08:00
Calclavia 4fdc27cabe Finished hard core large gear connection logic 2014-01-26 19:51:06 +08:00
Calclavia 4ac678aa00 Large gears are now omni-directional 2014-01-26 16:09:38 +08:00
Calclavia cca5d6fafe Fixed large gear save and load 2014-01-26 15:47:21 +08:00
Calclavia fb345993c4 Forgot trait implementation 2014-01-26 00:51:30 +08:00
Calclavia 152051801a Added large gears 2014-01-26 00:50:58 +08:00
Calclavia 497d566bfa Some minor work on the mixer 2014-01-25 22:28:05 +08:00
Calclavia 1c3898bd9e Removed pump for now 2014-01-25 22:12:24 +08:00
Calclavia 733220edef Fixed grate fill algorithm 2014-01-25 22:07:27 +08:00