Commit graph

  • 1d4116a215 Flattened frames drcrazy 2018-09-14 17:16:59 +0300
  • 94b1e19abf Merge remote-tracking branch 'remotes/origin/master' into 1.13-prep modmuss50 2018-09-13 20:16:23 +0100
  • 5307fd4528 Fix fluid config showing when it shouldn't modmuss50 2018-09-13 20:01:35 +0100
  • 01a3663b11 more changes to the inventory stuff modmuss50 2018-09-13 19:56:32 +0100
  • 01644e4f65 Fix slot config, some changes to the way Inventory works as well to allow for this. modmuss50 2018-09-13 19:33:14 +0100
  • 305f74b107 Storage blocks flattened drcrazy 2018-09-12 16:56:24 +0300
  • 7393a8bdd6 Ores flattened drcrazy 2018-09-12 16:15:05 +0300
  • 916c8c5ba4 Initial work on ores flattening drcrazy 2018-09-10 16:45:04 +0300
  • 35669641ba Changed translation names for ingredients drcrazy 2018-09-10 13:42:22 +0300
  • 1b3bf6f5c2 Cleaned up translation keys drcrazy 2018-09-07 17:37:49 +0300
  • b05c2e948f Reorganized items json registration drcrazy 2018-09-07 16:27:19 +0300
  • 3444c05c40
    IInventory > IItemHandler Modmuss50 2018-09-07 14:05:19 +0100
  • 645606c5c4 itemRubber already oredicted in proper class drcrazy 2018-09-07 15:25:10 +0300
  • 6d3d1f2df2 Organized items. MOved creative tab setter to parent. drcrazy 2018-09-07 14:51:41 +0300
  • c56da8cf18
    Use static fuse in static way. cherry-pick from: 8cac9a9315 drcrazy 2018-09-07 11:31:38 +0100
  • 8cac9a9315 Use static fuse in static way. drcrazy 2018-09-07 13:31:38 +0300
  • 67226de701
    fix compile changes Modmuss50 2018-09-05 18:43:33 +0100
  • 6060a97855
    Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep Modmuss50 2018-09-05 17:49:49 +0100
  • 6d4616b38e Updated constructor parameter name drcrazy 2018-09-04 17:37:32 +0300
  • b41783054e Fixed translation keys and update TR discord link drcrazy 2018-09-04 17:25:45 +0300
  • 79ff8ee5b0 Cleaned up code dupes drcrazy 2018-09-04 13:46:51 +0300
  • a05ba25f31 Flattened upgrades drcrazy 2018-09-04 13:26:09 +0300
  • a40635e75f Renamed ModItems to TRItems. Sorted members inside it. drcrazy 2018-09-03 17:46:21 +0300
  • 0443ad4a3a Destructopack is a separate item drcrazy 2018-09-03 17:01:46 +0300
  • 33b9f697dc Merged all ingredients into single class drcrazy 2018-09-03 14:49:59 +0300
  • 0b1733b733 DUsts and dustsSmall are combined into single class drcrazy 2018-09-03 14:00:06 +0300
  • f01d75404c Buffed oreCoal processing in Industrial Grinder drcrazy 2018-09-02 23:45:02 +0300
  • 253abcad48
    #releaseBuild Modmuss50 2018-09-02 14:15:57 +0100
  • 9a19223c84
    Revert "Updated JEI compat to use VanillaTypes" Modmuss50 2018-09-02 14:02:08 +0100
  • 852c4584a4
    Fix language issues Modmuss50 2018-09-02 13:57:41 +0100
  • c527bb1976
    #releaseBuild Modmuss50 2018-09-01 23:49:19 +0100
  • 7ed304329a
    Log more when building #releaseBuild Modmuss50 2018-09-01 23:46:05 +0100
  • 96c36e272f
    #releaseBuild Modmuss50 2018-09-01 23:32:26 +0100
  • 08cee81d54 Updated machine names in JEI. drcrazy 2018-09-01 03:01:51 +0300
  • 3190185a54 Cleaned fluid translation keys. drcrazy 2018-09-01 02:46:25 +0300
  • 53ad3a7a60
    Add configs to the nuke, closes #1594 Modmuss50 2018-08-31 16:32:16 +0100
  • cee083eb88
    Fix crowdinExport task Modmuss50 2018-08-31 16:00:31 +0100
  • d4e08ba976
    Trigger a crowdin export before downloading the translations Modmuss50 2018-08-31 15:29:59 +0100
  • edf0227598 CLeanup of blocks drcrazy 2018-08-31 15:36:39 +0300
  • 1b0ff5f95a
    Fix small naming issue Modmuss50 2018-08-31 13:25:01 +0100
  • cc8c2c6e3b
    Fix odd name for Auto Crafting Table Modmuss50 2018-08-31 13:19:55 +0100
  • cdaefe5886 Changed translation keys for block and items drcrazy 2018-08-31 14:50:05 +0300
  • 9b0f583cab
    Translations are now handled over at https://translate.techreborn.ovh/ using crowdin Modmuss50 2018-08-30 22:47:25 +0100
  • 2d3c074767 Fix for cells in CT scripts. Some work on #1590 drcrazy 2018-08-29 18:23:56 +0300
  • c41b889160 Updated JEI compat to use VanillaTypes drcrazy 2018-08-29 16:44:45 +0300
  • f0852a09cf Updated JEI createDrawable usage for fusion reactor. drcrazy 2018-08-28 16:43:37 +0300
  • f54353290b Updated ru_ru lang. Should fix FTBTeam/FTB-Continuum#437 drcrazy 2018-08-28 14:32:59 +0300
  • 304046b457 Update ru_ru.lang (#1582) EnGinners 2018-08-28 15:40:47 +0500
  • e254f519c6 Removed excessive not null check drcrazy 2018-08-28 11:21:15 +0300
  • c1be3fb765
    Fixes https://github.com/FTBTeam/FTB-Continuum/issues/428 Modmuss50 2018-08-27 18:23:16 +0100
  • f44aa92093 Removed unused imports drcrazy 2018-08-27 17:52:26 +0300
  • db4dbdc956 UU-matter is now part of parts enum drcrazy 2018-08-27 15:48:41 +0300
  • 8f7cc291bd OreDict partially back, same for some recipes drcrazy 2018-08-27 15:28:26 +0300
  • 8987311694 Flattened parts drcrazy 2018-08-27 13:26:56 +0300
  • f251349189
    Should fix #1587 Modmuss50 2018-08-24 21:07:38 +0100
  • 0ea442a993
    Merge pull request #1588 from YuRaNnNzZZ/1.12-rockcutterfix Modmuss50 2018-08-24 18:16:56 +0100
  • 2e461b5ef6
    rock cutter no longer gets enchanted on recraft YuRaNnNzZZ 2018-08-24 20:12:50 +0300
  • de45f3e68d SmallDusts flattened drcrazy 2018-08-24 15:56:53 +0300
  • edd4e0df3e Flattened dusts. drcrazy 2018-08-24 14:56:25 +0300
  • 1ee9ffb007 Flattened ingots. drcrazy 2018-08-24 13:43:03 +0300
  • aadc7150f3 Gems are flattened drcrazy 2018-08-23 17:16:17 +0300
  • 2939ee02a3 Flattened nuggets drcrazy 2018-08-23 15:20:57 +0300
  • 45d6317d12 Changes plates registration drcrazy 2018-08-23 14:05:22 +0300
  • c86f3dc2f4 Changes after PR review drcrazy 2018-08-23 13:36:56 +0300
  • f45da44f2b Plates are flattened and enumed drcrazy 2018-08-23 00:14:02 +0300
  • be024f0179 Updated forge drcrazy 2018-08-22 15:55:14 +0300
  • 5d17985960
    #releaseBuild Modmuss50 2018-08-14 01:10:55 +0100
  • 1d7ff39ccf
    Merge remote-tracking branch 'origin/1.12' into 1.12 Modmuss50 2018-08-14 01:09:18 +0100
  • 77ec6b6aaf
    Hot fix for #1574 #releaseBuild Modmuss50 2018-08-14 01:08:50 +0100
  • 337a500a5c Coolant part also craftable from water cells drcrazy 2018-08-13 15:35:30 +0300
  • 8eed83b0f8
    Merge pull request #1573 from DYColdWind/patch-5 Modmuss50 2018-08-13 10:01:17 +0100
  • 3681e0b1e3
    Update zh_cn.lang 冷风 2018-08-13 08:58:10 +0800
  • f2c5d71fb7
    #releaseBuild Modmuss50 2018-08-12 16:51:13 +0100
  • 35f82eb5d3
    Update licenses Modmuss50 2018-08-12 16:36:16 +0100
  • 4e352c0953
    Add creative versions of the Quantum tank and chest, they provide unlimited amount of the specified item/fluid Modmuss50 2018-08-12 16:32:43 +0100
  • 84aeeb978c
    Fix most modded fluids not working in our machines Modmuss50 2018-08-11 20:08:44 +0100
  • 89beff99c7
    Fluid config work Modmuss50 2018-08-11 15:23:57 +0100
  • 808a07fdbf
    Merge remote-tracking branch 'origin/1.12' into 1.12 Modmuss50 2018-08-10 17:46:10 +0100
  • 39475f86dc
    Initial fluid config work Modmuss50 2018-08-10 17:45:16 +0100
  • f7df41c379 Fix for typo in world config name. drcrazy 2018-08-10 15:38:46 +0300
  • d37f52a0ce Less chance for overworld TR loot and made in configurable. CLoses #1572 drcrazy 2018-08-10 15:33:59 +0300
  • c3979610a9 Removed unused imports drcrazy 2018-08-10 15:32:17 +0300
  • 062114f3a9
    Merge remote-tracking branch 'origin/1.12' into 1.12 modmuss50 2018-08-08 15:15:53 +0100
  • 7270adbec4
    Revert: [ImgBot] optimizes images - Fixes textures having a solid background modmuss50 2018-08-08 15:15:26 +0100
  • fb957e9dac Allow oregen in non-vanilla dimensions. Closes #1571 drcrazy 2018-08-08 17:00:02 +0300
  • 2e4c3ebf1a Some flattening attempt for plates drcrazy 2018-08-07 13:50:46 +0300
  • 53b450acea
    Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep modmuss50 2018-08-03 18:04:40 +0100
  • 1cd5e06757
    #releaseBuild modmuss50 2018-08-03 17:58:12 +0100
  • 7e49c30586
    Add a transparent grey overlay over recipe output slot modmuss50 2018-08-03 17:55:59 +0100
  • ee65ed0cbe
    Merge remote-tracking branch 'origin/1.12' into 1.12 modmuss50 2018-08-03 17:47:26 +0100
  • e5d161cace
    Write locked to nbt modmuss50 2018-08-03 17:46:58 +0100
  • 94fa8d1b62
    Merge pull request #1569 from TechReborn/imgbot Modmuss50 2018-08-03 00:40:16 +0100
  • c461dd8cf5
    #releaseBuild modmuss50 2018-08-02 19:18:01 +0100
  • bbef813fe5
    thanks idea for importing the best imports, fixes build modmuss50 2018-08-02 19:09:11 +0100
  • b8ad3175fd
    Add JEI support for recipes in auto crafting table modmuss50 2018-08-02 19:07:56 +0100
  • e1d1ab8c08
    Merge remote-tracking branch 'origin/1.12' into 1.12 modmuss50 2018-08-02 18:43:25 +0100
  • ffb770f64f
    Rework the auto crafter to not use the recipe book, will fix it being impossible to use in some mod packs like continuum for example. modmuss50 2018-08-02 18:42:58 +0100
  • d03b0edbd7 Max energy for matter fabricator is 10M EU \ 40M FE drcrazy 2018-08-02 18:06:43 +0300
  • 16293571a2
    Merge remote-tracking branch 'origin/1.12' into 1.12 modmuss50 2018-07-30 19:42:28 +0100
  • 3d9b81a6b0
    Fix possible dupe bug, and allow better support for larger item stack sizes modmuss50 2018-07-30 19:42:08 +0100