Commit graph

  • a59647a0b7
    Merge pull request #1379 from InterPlay02/1.12 Modmuss50 2017-12-23 22:13:45 +0000
  • 05884b2fda Fix issue with chainsaw cutting speed. Closes #1376 drcrazy 2017-12-23 00:28:53 +0300
  • 91ee4e722d
    Fixed one single word InterPlay 2017-12-22 12:32:24 -0200
  • b9084d620e
    #releaseBuild modmuss50 2017-12-22 13:15:00 +0000
  • 15d24d3840
    Update libs modmuss50 2017-12-22 13:14:00 +0000
  • 5a40749bcd
    Fixed #1364 modmuss50 2017-12-22 12:51:16 +0000
  • 623983f20a
    Merge remote-tracking branch 'origin/1.12' into 1.12 modmuss50 2017-12-19 23:50:52 +0000
  • 7ab59db7c0
    Improve idle auto crafting table tick time, more work still needs to be done. Closes #1374 modmuss50 2017-12-19 23:50:38 +0000
  • 1b9844a6cd Made obsidian grindable. drcrazy 2017-12-19 13:05:57 +0300
  • 8b90bc6a60
    Merge pull request #1373 from DYColdWind/zh_cn.lang Modmuss50 2017-12-19 09:44:51 +0000
  • a4b6f81178
    Update zh_cn.lang 冷风 2017-12-19 13:49:40 +0800
  • ec1be6b639
    Update zh_cn.lang 冷风 2017-12-19 13:48:50 +0800
  • 7594b55fb5
    Start work on the alarm modmuss50 2017-12-18 19:58:52 +0000
  • 3698cf379e
    Merge pull request #1372 from InterPlay02/1.12 Modmuss50 2017-12-18 18:12:12 +0000
  • 2815bc84d4
    Just fixed a single word InterPlay 2017-12-18 16:09:39 -0200
  • 1909d426e3
    Uploaded pt-BR.lang File InterPlay 2017-12-18 16:08:00 -0200
  • 328aac0ed2 Make lapis ore grindable to vanilla lapis. drcrazy 2017-12-18 18:29:00 +0300
  • 677bb59ceb Should hopefully fix server crash #releaseBuild Fixes #1371 modmuss50 2017-12-18 01:48:25 +0000
  • 5be3163eeb
    #releaseBuild modmuss50 2017-12-17 22:20:28 +0000
  • 55c5f58c7e
    Clocking device now makes the player fully invisible modmuss50 2017-12-17 22:13:29 +0000
  • 3c7cd638c1
    Make smaller cables have a smaller bounding box modmuss50 2017-12-17 22:05:14 +0000
  • dc4cdbb9cc
    Fixes #1368 modmuss50 2017-12-17 21:53:14 +0000
  • ee075feea9
    Fixes #1359 modmuss50 2017-12-17 21:43:12 +0000
  • 7f289e2356
    Add ic2 item discharge support, closes #1357 modmuss50 2017-12-17 21:36:48 +0000
  • 82eb0f62d6
    Fixes #1354 modmuss50 2017-12-17 21:24:25 +0000
  • dce7e43c4f Fixed amount for empty cells. Closes #1366 drcrazy 2017-12-16 01:46:34 +0300
  • 6c7f9078ec Secondary gem moved to eventHandler. Closes #1365 drcrazy 2017-12-15 16:43:48 +0300
  • 376f02df26 Updated Sawmill GUI and TileEntity. drcrazy 2017-12-13 12:29:39 +0300
  • 33be3cf35d #releaseBuild modmuss50 2017-12-11 13:20:40 +0000
  • 1d18740215 Fixed rotation for solar panels. Closes #1358 drcrazy 2017-12-11 12:03:20 +0300
  • 17f819e9c6 Added charcoal dust grinder recipe. drcrazy 2017-12-08 20:25:25 +0300
  • a419189926 Added dust->ingot<->block recipes for several materials. Closes #1356 drcrazy 2017-12-08 16:43:04 +0300
  • 1581ad439c Revert maven changes modmuss50 2017-12-06 11:05:22 +0000
  • 73f1fa9a86 Use older version of ic2 that has been cached, should be reverted at a later date. modmuss50 2017-12-05 17:37:11 +0000
  • 696e6a9626 Use mod maven to proxy around ic2 maven being down. modmuss50 2017-12-05 17:32:55 +0000
  • 53c731d678 Handful of improvements to the electrical furnace, closes #1349 modmuss50 2017-12-04 20:55:57 +0000
  • 777707373a Fixed cells piping into Industrial Grinder. drcrazy 2017-12-04 23:10:33 +0300
  • 2f54305f6d Added filter for fluidSlot. Closes #1352 drcrazy 2017-12-04 22:34:34 +0300
  • 6e6a0c199c
    Merge pull request #1350 from DYColdWind/patch-2 Prospector 2017-12-01 16:34:18 -0800
  • e8d6009e83
    Update zh_cn.lang 冷风 2017-12-02 08:26:48 +0800
  • 5d8c96bf47
    #releaseBuild drcrazy 2017-12-01 23:30:27 +0300
  • df24adb936 Made solar panel wrenchable drcrazy 2017-12-01 19:24:02 +0300
  • 6202b46cf7 Fixed unused imports drcrazy 2017-12-01 19:04:30 +0300
  • 8060e8df55
    Merge pull request #1348 from TechReborn/feature/solar-panles Modmuss50 2017-12-01 14:25:59 +0000
  • 3c68417fd9 Item liquidation (#1347) Dimmerworld 2017-12-02 01:16:39 +1100
  • b2d2be24c6 Updated recipies and fixed build drcrazy 2017-11-30 16:46:11 +0300
  • f6fca1c623 Merge branch '1.12' of https://github.com/TechReborn/TechReborn.git into feature/solar-panles drcrazy 2017-11-29 17:13:36 +0300
  • 9ac8b31599 Fixed TOP\Waila icon for active machine drcrazy 2017-11-29 15:23:40 +0300
  • 4d043faa27 Fixes #1344 modmuss50 2017-11-29 09:35:00 +0000
  • 2603fa5df7 Merge remote-tracking branch 'origin/1.12' into 1.12 modmuss50 2017-11-28 17:44:18 +0000
  • b8964b6eca Update mappings modmuss50 2017-11-28 17:25:36 +0000
  • eab088c094 Merge branch '1.12' into feature/solar-panles drcrazy 2017-11-28 17:28:47 +0300
  • 703f49752e Updated top texture for solar panels drcrazy 2017-11-28 16:52:14 +0300
  • be227b4edb Fixed type in zenclass name. Closes #1332 drcrazy 2017-11-05 23:49:11 +0300
  • 8abfa5cd56 #releaseBuild modmuss50 2017-11-05 12:05:17 +0000
  • 3afe2c8910 Add lang names for new lights modmuss50 2017-11-05 12:04:22 +0000
  • 642e6b0f2b Implement powered lighting. Alistair Buxton 2017-10-13 18:40:36 +0100
  • db9da00fec Don't always push to github Modmuss50 2017-11-01 16:08:58 +0000
  • 160ab3bb5f Add support for github releases (Testing) Modmuss50 2017-11-01 16:03:44 +0000
  • 8a114d53ad #releaseBuild Modmuss50 2017-10-29 22:24:15 +0000
  • 34913c4817 Added config for several multiblock machines. drcrazy 2017-11-28 15:23:32 +0300
  • 9a8a7455ff Fixed warning for FusionReactorRecipeWrapper drcrazy 2017-11-27 17:58:37 +0300
  • 779551cf70 Fixed JavaDoc and CTScrapbox warnings drcrazy 2017-11-27 17:55:01 +0300
  • e2f177b757 Can now charge ic2 items, closes #1202 modmuss50 2017-11-27 13:34:45 +0000
  • 850ec54bd3 Bump version #releaseBuild modmuss50 2017-11-27 09:36:06 +0000
  • bff9179734 Updated multiblock to use BlockPos rather than CoordTriplet drcrazy 2017-11-25 03:30:58 +0300
  • 9aa3d3e59d Added back buildcraft support modmuss50 2017-11-24 14:59:49 +0000
  • def8cb5355
    Fix dupe bug, Fixes https://github.com/TechReborn/TechReborn/issues/1342 modmuss50 2017-11-18 20:37:14 +0000
  • 1f224277e5 zh_cn.lang (#1341) 冷风 2017-11-18 17:02:46 +0800
  • f1a179d26e #releaseBuild drcrazy 2017-11-15 10:40:28 +0300
  • 64495919c0 Added config for transformers to follow IC2 style. Closes #1326 drcrazy 2017-11-14 14:34:14 +0300
  • ffe115bee1 Fixed iridium oregen. Closes #1330 drcrazy 2017-11-13 18:29:16 +0300
  • 150fb2a2c4 Fixed iron furnace fuel slot shift-click in ugly way. Closes #968 drcrazy 2017-11-13 13:46:20 +0300
  • 53c8033a99 Fixed duplicate registration for basic machine frame. Closes #1340 drcrazy 2017-11-13 11:47:15 +0300
  • 9d1e64b1b2 Fixed texture error for fluid itemblocks. drcrazy 2017-11-13 02:14:44 +0300
  • bf5b649fc4 Removed unused code, added Override annotation drcrazy 2017-11-12 12:15:32 +0300
  • 14f715ff7b #releaseBuild drcrazy 2017-11-10 12:59:26 +0300
  • 3d623292f8 Fixed more warnings drcrazy 2017-11-10 12:48:01 +0300
  • 25d561c81c Fixed imports and suppressed recipe warnings. drcrazy 2017-11-10 12:27:31 +0300
  • 29d1176861 Fixed casing model with CTM enabled drcrazy 2017-11-10 01:29:08 +0300
  • 41dd0468e6 Fixed CTM version of LESU Storage. drcrazy 2017-11-10 01:21:59 +0300
  • 5bfe649360 Added coils check in onLoad. Closes #1337 drcrazy 2017-11-08 03:16:51 +0300
  • 5f2ddec821 Un-oredicted frame for grinder recipe. Closes #1331 drcrazy 2017-11-08 02:05:07 +0300
  • 8cacd3d8d1 Limited LESU max storage to MAX_INT FE or MAX_INT/4 EU. Closes #1328 drcrazy 2017-11-08 01:48:11 +0300
  • 2ff9b6950d Fixed type in zenclass name. Closes #1332 drcrazy 2017-11-05 23:49:11 +0300
  • dedde645ad
    #releaseBuild modmuss50 2017-11-05 12:05:17 +0000
  • d004ceef0e
    Add lang names for new lights modmuss50 2017-11-05 12:04:22 +0000
  • 19ccbd681d Fixed itemBlock rendering. TOP\Waila are still an issue drcrazy 2017-11-05 02:32:06 +0300
  • fadd249ed7
    Merge pull request #1334 from ali1234/feature/lighting Modmuss50 2017-11-04 10:30:33 +0000
  • c6ac9110fe Implement powered lighting. Alistair Buxton 2017-10-13 18:40:36 +0100
  • 4d227e1401
    Don't always push to github Modmuss50 2017-11-01 16:08:58 +0000
  • ec3ceab52d
    Add support for github releases (Testing) Modmuss50 2017-11-01 16:03:44 +0000
  • 18fed6b237 Fixed #texture start up error drcrazy 2017-10-30 23:18:03 +0300
  • 314a41e465
    #releaseBuild Modmuss50 2017-10-29 22:24:15 +0000
  • 047507f4fc Fixed error message about #texture drcrazy 2017-10-29 02:44:04 +0300
  • 2f52171a04 Still didnt fix it ;( modmuss50 2017-10-09 22:31:33 +0100
  • c0fc388a01 I tried to fix item rendering issues, but failed. modmuss50 2017-10-09 13:36:39 +0100
  • e0edff6891 Some more work on solar panels. modmuss50 2017-10-09 12:06:57 +0100
  • 0aa8974035 Fix some issues with the solar panels modmuss50 2017-10-09 11:48:13 +0100
  • 3fe609e207 Fix poweroutput Dimmerworld 2017-10-08 13:27:38 +1100