Commit graph

  • a75a493de7 Added blaze dust and HOP graphite dust recipes. drcrazy 2018-07-30 13:07:50 +0300
  • a6f242e7e6 Overriden setContainerToEmpty. I thought this was already in GH. drcrazy 2018-07-30 11:48:39 +0300
  • 2a0d737c92
    [ImgBot] optimizes images ImgBotApp 2018-07-28 18:42:24 +0000
  • c0b7c16dfd
    Merge pull request #1568 from TechReborn/imgbot Modmuss50 2018-07-28 19:40:53 +0100
  • 3dd8a18868
    [ImgBot] optimizes images ImgBotApp 2018-07-28 18:38:58 +0000
  • c27644bf17
    Merge remote-tracking branch 'origin/1.12' into 1.12 modmuss50 2018-07-28 13:06:11 +0100
  • 3659bfa5eb
    Fix some small issues with the json files modmuss50 2018-07-28 12:59:57 +0100
  • e443c9bc70
    Should make this serverside only for now modmuss50 2018-07-28 12:59:57 +0100
  • 88e116d095
    Merge remote-tracking branch 'origin/1.12' into 1.12 modmuss50 2018-07-26 18:28:58 +0100
  • 8139b865a9
    Fix potential issues modmuss50 2018-07-26 18:16:59 +0100
  • 693cb6807a
    Inital pass of cleaning up the networking, I will prob do some more in 1.13 modmuss50 2018-07-24 14:27:17 +0100
  • 69b9c511c3
    Remove legacy tile support modmuss50 2018-07-24 14:23:31 +0100
  • 1f65363396
    Merge remote-tracking branch 'origin/1.13-prep' into 1.13-prep modmuss50 2018-07-24 14:18:22 +0100
  • 1be2752b72
    Rename fluids modmuss50 2018-07-24 14:18:09 +0100
  • a42e04606f Done with maxCharge and trasnferRate review for powered items drcrazy 2018-07-23 14:21:07 +0300
  • eb2816df1d Returned return. drcrazy 2018-07-23 13:47:12 +0300
  • b3002b6f57 Fixed warnings drcrazy 2018-07-23 12:55:18 +0300
  • 095390b430
    Fix cell model modmuss50 2018-07-20 22:39:09 +0100
  • 2910acc29c
    Remove META_PLACEHOLDER modmuss50 2018-07-20 22:36:38 +0100
  • f5c6b59ebd
    Mappings modmuss50 2018-07-20 22:31:20 +0100
  • 389b716880
    Fix build modmuss50 2018-07-20 22:10:29 +0100
  • 7f8ce535a7
    General code cleanup modmuss50 2018-07-20 22:08:21 +0100
  • 95b49e5e23
    Move some stuff around in RC modmuss50 2018-07-20 22:02:46 +0100
  • f78abb1a21
    Remove some old stuff modmuss50 2018-07-20 21:55:29 +0100
  • 7b630f576f Polishing powered items drcrazy 2018-07-20 17:23:21 +0300
  • daf4b6fad6 Capacity changes for powered armor drcrazy 2018-07-20 12:58:52 +0300
  • b3590dbb37 Make it run but tons of useless copy-paste drcrazy 2018-07-20 02:56:19 +0300
  • 523d0284b7 Updated powered items to match RC changes drcrazy 2018-07-19 18:30:47 +0300
  • 712136914a
    Mod Compat is now in its own repo, found at https://github.com/TechReborn/TechReborn-ModCompatibility modmuss50 2018-07-19 10:56:41 +0100
  • b65e963f12
    Move all mod compatibility out into its own mod, ic2 support is gone and will come back in some more basic form once ic2 is on 1.13 modmuss50 2018-07-19 10:48:30 +0100
  • 4ea0dc1e9a
    Dont build on jenkins modmuss50 2018-07-19 08:20:57 +0100
  • 2b74ea1ebe Removed excessive finals. drcrazy 2018-07-16 18:19:31 +0300
  • 5ce0397575 Changed Blocks.AIR to Material.AIR in multiblock checks. drcrazy 2018-07-16 15:46:39 +0300
  • 60873481f3 Unused anymore. drcrazy 2018-07-13 18:04:50 +0300
  • c35d85fe10 More loot tables. drcrazy 2018-07-12 17:41:14 +0300
  • 760dea8f94 Moved Event Bus registration to compat module. drcrazy 2018-07-10 02:24:05 +0300
  • 2b32e6ecf1 Moved IC2 compat recipes from postInit to event. Closes #1565 drcrazy 2018-07-10 02:13:48 +0300
  • 1777343e96 Added TR loot to basic Overworld chests. drcrazy 2018-07-09 17:06:15 +0300
  • 525e85dd4a #releaseBuild drcrazy 2018-06-27 17:03:16 +0300
  • ced370444f adv/diamond electric tools charge rate buff (#1558) (Kudos to YuRaNnNzZZ) YuRaNnNzZZ 2018-06-26 11:53:21 +0300
  • ff9ceecc28 Removed unused imports ) drcrazy 2018-06-25 14:55:23 +0300
  • d4a43d24a1
    Fix incorrect usage of item stack checking modmuss50 2018-06-25 12:34:13 +0100
  • 96d78c11a8 Shift for more info on powerbar. Closes FTBTeam/FTB-Continuum#261 drcrazy 2018-06-25 12:26:07 +0300
  • 7124ee6a11
    Remove range upgrade as it didnt do anything modmuss50 2018-06-24 10:48:47 +0100
  • 00a317074d Speed up items charge. drcrazy 2018-06-24 12:20:06 +0300
  • af6cb38bfb Fix crash with non-TR items charge. drcrazy 2018-06-24 12:14:12 +0300
  • d6b9656b7c Fix for Assembly Machine JEI GUI progress. Closes #1555 drcrazy 2018-06-23 19:30:33 +0300
  • 452932c04e More formatting changes. drcrazy 2018-06-23 19:00:44 +0300
  • 52ff6699b4 Fusion reactor consumes resources. Fixes #1551 (#1556) Eric Chai 2018-06-23 11:40:56 -0400
  • 1de3fe5dc5 Lot of formatting. drcrazy 2018-06-22 18:22:16 +0300
  • ec13f82628 Updated OC version. drcrazy 2018-06-22 15:40:32 +0300
  • d584aebcd8 Fixed water mill animation. drcrazy 2018-06-22 13:35:26 +0300
  • 30302e241b Fixed charging \ discharging items items. Closes #1547 drcrazy 2018-06-20 18:27:25 +0300
  • ca9a2c9b38 Corrected the ADVANCED_JACKHAMMER recipe (#1553) Eric Chai 2018-06-20 04:45:47 -0400
  • 48d2227407 Made batteries charge configurable for non-basic batteries. drcrazy 2018-06-19 14:01:10 +0300
  • 1ebf67d933 Add Silk Touch to the rock cutter in the recipe and creative tab, so it's more obvious of what it does ProfessorProspector 2018-06-16 10:27:19 -0700
  • a32c40a68a Merge remote-tracking branch 'origin/1.12' into 1.12 ProfessorProspector 2018-06-16 10:05:16 -0700
  • 77ed9f7bba Remove accidental refined diamond ProfessorProspector 2018-06-16 10:03:20 -0700
  • 0e857e8b70
    Fix #1546 modmuss50 2018-06-16 16:37:17 +0100
  • 7be239adca Updated wrenching logic for energy storages and casings. Closes #1543 drcrazy 2018-06-15 18:18:32 +0300
  • 24bce3ce66 Updated wrenching for lamp and alarm drcrazy 2018-06-15 17:26:43 +0300
  • 8d1c116df0 Updated wrench logic for cables. drcrazy 2018-06-15 16:49:46 +0300
  • 603e346c0f New ore textures ProfessorProspector 2018-06-14 19:17:53 -0700
  • 9ed05fb7ff Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12 ProfessorProspector 2018-06-14 10:57:07 -0700
  • cfda5fd2a4 Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12 ProfessorProspector 2018-06-14 10:53:32 -0700
  • c409b67c3c Updated block wrenching drcrazy 2018-06-14 18:32:35 +0300
  • 77e1c54b86 Fixed inventory drop for DSU. More work on #1543 drcrazy 2018-06-14 18:31:48 +0300
  • b1682ef791
    Update README.md Prospector 2018-06-13 18:35:42 -0700
  • 42bc110cb2 Fixed build, but DSU blocks are not done yet. drcrazy 2018-06-13 17:42:46 +0300
  • e2225b06d4 Updated wrenching logic. Some work for #1543 drcrazy 2018-06-13 15:28:31 +0300
  • 6d3b415ddd Unify creative tabs Prospector 2018-06-12 15:42:20 -0700
  • ac9c01555f Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12-v2.16 Prospector 2018-06-12 15:13:23 -0700
  • 7e794894a3 Add a gradle task to output libs Prospector 2018-06-12 15:13:17 -0700
  • baacc67a64 Fixed unused and override warnings. drcrazy 2018-06-12 12:55:57 +0300
  • bc8cdbfeff
    Test commit modmuss50 2018-06-11 16:54:58 +0100
  • 4d4aea51a6
    #releaseBuild modmuss50 2018-06-10 12:00:08 +0100
  • 7db0097d23
    Fusion reactor uses inputs before the craft starts to prevent power exploit, closes #1539 modmuss50 2018-06-10 11:53:03 +0100
  • c201b3dbcf
    Make fusion reactor recipe shapeless, so it can work either way around modmuss50 2018-06-10 11:47:51 +0100
  • 32ea97b29e
    Fix #1541 modmuss50 2018-06-10 11:41:45 +0100
  • dace0e56d0
    Show required stacks when building fusion reactor modmuss50 2018-06-10 11:36:21 +0100
  • 7ac0b83bc9
    Merge pull request #1542 from DYColdWind/patch-4 Modmuss50 2018-06-10 10:56:33 +0100
  • 6fc0687d76
    Update zh_cn.lang 冷风 2018-06-10 09:47:50 +0800
  • 00b40e99ad
    #releaseBuild modmuss50 2018-06-09 17:05:15 +0100
  • 475eb4b55f
    Revert "Fixed warning in stack tooltip event." modmuss50 2018-06-09 17:03:07 +0100
  • c15f808686
    #releaseBuild modmuss50 2018-06-09 12:43:23 +0100
  • d9b8f274e0
    Add rubber tree biome blacklist, closes #1529 modmuss50 2018-06-09 12:39:55 +0100
  • 354a80572c
    Tweak power output of fusion reactor, closes #1521 modmuss50 2018-06-09 12:26:11 +0100
  • 0536ef08a0
    Fix some final issues with the slabs + add recipes modmuss50 2018-06-09 11:32:02 +0100
  • a567139ffd
    Merge remote-tracking branch 'origin/1.12' into 1.12 modmuss50 2018-06-09 11:19:31 +0100
  • 1e129640fe
    Copy itemstacks before checking them for valid wood recipes, should fix #1538 modmuss50 2018-06-09 11:19:16 +0100
  • 05bab2ec4c
    Merge pull request #1537 from yaroslav4167/patch-2 Modmuss50 2018-06-08 23:35:47 +0100
  • 821d4081a3
    Update ru_ru.lang Yaroslavik 2018-06-09 00:33:44 +0200
  • 60c8527f6d
    Rubber plank stairs and slab modmuss50 2018-06-08 21:05:56 +0100
  • 169fa646fb
    Add slot config to iron furnace, fixes #1536 modmuss50 2018-06-08 18:46:50 +0100
  • 914aa3423b
    Fixes #1533 modmuss50 2018-06-08 18:39:16 +0100
  • 548d393820
    Allow repairing gem tools and armor in anvil modmuss50 2018-06-08 18:33:26 +0100
  • 93e324cc11 Fixed electric tree tap. Closes #1535 drcrazy 2018-06-08 15:46:28 +0300
  • 76735d93bd Added contributing checklist. drcrazy 2018-06-07 17:22:39 +0300
  • 23428d3223 Made transfer rate per connection drcrazy 2018-06-07 03:09:03 +0300
  • cc541bd55c
    #releaseBuild modmuss50 2018-06-05 22:12:58 +0100