Commit graph

  • acf59dd1a5 Merge remote-tracking branch 'remotes/origin/1.15' into 1.16 modmuss50 2020-03-23 20:19:53 +0000
  • 8dae42d04a
    Update REI to v4.1-unstable (#2063) shedaniel 2020-03-19 22:23:52 +0800
  • e4fb1773f3 20w12a modmuss50 2020-03-18 20:58:31 +0000
  • 7138a8d45b Config for Oregen. Closes #2062 drcrazy 2020-03-18 17:20:48 +0300
  • 8f64355885 Buff Nano Saber damage. Closes #1714 drcrazy 2020-03-17 14:52:19 +0300
  • 0817b70f55 Update almandine dust textures Prospector 2020-03-13 16:28:24 -0700
  • e3829cf44f Update some textures and rebalance a few recipes Prospector 2020-03-13 11:12:07 -0700
  • 99b2755887 Renames to match yarn changes modmuss50 2020-03-12 20:56:44 +0000
  • 5b1e68d093 Support the new gold ore tag modmuss50 2020-03-12 20:43:48 +0000
  • e3749343e7 Merge remote-tracking branch 'remotes/origin/1.15' into 1.16 modmuss50 2020-03-12 20:33:54 +0000
  • f60daa7376 Merge remote-tracking branch 'origin/1.16' into 1.16 modmuss50 2020-03-12 20:32:39 +0000
  • adad632549 initial 20w11a modmuss50 2020-03-12 20:32:03 +0000
  • 416fbbf607 Allow to keep enchants only for TR items. Closes #1952 drcrazy 2020-03-10 13:51:34 +0300
  • 3e3ca8dd41 Enchants persist through crafting. Some work on #1952 drcrazy 2020-03-10 10:11:07 +0300
  • 21b0620d30 #releaseBuild modmuss50 2020-03-06 12:38:49 +0000
  • f99d822cf2 Fix https://github.com/TechReborn/TechReborn/issues/2055 modmuss50 2020-03-06 12:26:48 +0000
  • a88d34b87f
    improved rei compat (#2054) modmuss50 2020-03-05 19:24:29 +0000
  • 1de7b3afd2
    20w08a (#2052) Milan 2020-02-25 19:00:15 +0100
  • 3920ff79d9 End crystals can be used in implosion compressor. Closes #2027 drcrazy 2020-02-22 12:58:26 +0300
  • ebc2282c9f Added recipe fo flint dust from flint in grinder. Closes #2044 drcrazy 2020-02-18 14:12:32 +0300
  • af8bd7ae8c Bump Omni-tool damage. Closes #2043 drcrazy 2020-02-18 11:03:26 +0300
  • 6824caa3f5 Tags for most of ingredients. Thanks to justastranger drcrazy 2020-02-18 10:49:42 +0300
  • 785ef34450 #releaseBuild modmuss50 2020-02-12 19:07:13 +0000
  • dffec285b2 1.16 modmuss50 2020-02-12 18:36:01 +0000
  • b0d3b3b77d Should fix #2033 modmuss50 2020-02-12 18:05:58 +0000
  • 89aa42e62d
    Recipe to get quartz dust from various sources/products of quartz (#2038). Thanks to Jessifir Jessi Aurora 2020-02-12 00:56:39 -0800
  • eec531465b
    Add (vanilla) blasting recipes for ores/dusts (#2039). Thanks to Jessifir Jessi Aurora 2020-02-12 00:54:51 -0800
  • b9a36270a6 Assembly machine got usage in REI. Closes #2034 drcrazy 2020-02-10 21:44:39 +0300
  • c2f387f1ae AESU stores inventory correctly. Closes #2018 drcrazy 2020-02-10 21:33:21 +0300
  • bc0af95053
    Fix potential abuse with golden apple recipes (#2029). Thanks to Jessifir Jessi Aurora 2020-02-06 06:01:03 -0800
  • fdda671b63 #releaseBuild modmuss50 2020-01-30 14:00:15 +0000
  • 93e1107eba test modmuss50 2020-01-30 13:56:43 +0000
  • 4d94bd8221 Test commit modmuss50 2020-01-30 13:48:01 +0000
  • b9351e33a1 Should actually fix the treetap. Closes #2022 modmuss50 2020-01-29 15:17:28 +0000
  • fb6ac9b3cd #releaseBuild modmuss50 2020-01-28 21:15:33 +0000
  • 162e4bbbee Added quartz dust. Closes #2012 drcrazy 2020-01-27 16:30:30 +0300
  • bb206e9f41 Steel could be made with carbon cell. Some work on #2012 drcrazy 2020-01-27 12:22:45 +0300
  • 16ca412227 Steel could be made with carbon cell. Some work on #2012 drcrazy 2020-01-27 12:22:19 +0300
  • 9e67ab5725 Check rubber logs for sap from the ground level. (#2015) Kato 2020-01-26 19:18:25 +0100
  • adf5c7aba2 Merge remote-tracking branch 'origin/1.15' into 1.15 modmuss50 2020-01-26 18:18:04 +0000
  • 015d81ad24 Fix #2013 modmuss50 2020-01-26 18:17:56 +0000
  • 8f5318b6bb Nerf glowstone grinder recipe. drcrazy 2020-01-25 20:53:50 +0300
  • 0eb89ee122 Drills use energy to mine. Closes #2007 drcrazy 2020-01-25 20:51:03 +0300
  • 1cb6623dd7 Review nanosaber config drcrazy 2020-01-24 16:01:56 +0300
  • 9cccc70071 Review treetap, chainsaw and jackhammer configs drcrazy 2020-01-24 12:54:37 +0300
  • a06afa1a4a Redstone config polish modmuss50 2020-01-23 13:53:16 +0000
  • 3b2da8b510 Merge remote-tracking branch 'origin/1.15' into 1.15 modmuss50 2020-01-22 16:20:42 +0000
  • 04b8b2f266 Possibly fix 1.15.1 support. Should fix #1989 modmuss50 2020-01-22 16:19:26 +0000
  • 6725fd30a1 Update to latest yarn Prospector 2020-01-21 22:00:54 -0800
  • 147eec26f6 Fix missed mapping. #releaseBuild modmuss50 2020-01-21 15:50:33 +0000
  • 6447033d59 Merge remote-tracking branch 'origin/1.15' into 1.15 modmuss50 2020-01-21 15:44:38 +0000
  • 5d2569fa57 1.15.2 #releaseBuild modmuss50 2020-01-21 15:44:14 +0000
  • f3333832ac Review Drills configs drcrazy 2020-01-21 16:56:08 +0300
  • 74d96e4670 Fix hologram for distillation tower. drcrazy 2020-01-21 16:29:10 +0300
  • d023329de9 Quantum chest now extinguish fire. drcrazy 2020-01-21 15:19:59 +0300
  • bf730cd5a4 Fix TNT usage in implosion compressor drcrazy 2020-01-21 14:58:14 +0300
  • 1458716d12 Stripped log got rubber. Closes #1986 drcrazy 2020-01-21 14:28:07 +0300
  • 3e441a7aed Recipe for gunpowder drcrazy 2020-01-21 14:13:18 +0300
  • ae691fcfc5 LESU I\O logic change. Closes #1978 drcrazy 2020-01-21 01:51:17 +0300
  • 40cb57d451 #releaseBuild modmuss50 2020-01-20 21:57:02 +0000
  • 3ca34f79a5 Gui tabs cleanup modmuss50 2020-01-20 21:56:05 +0000
  • 30a9aa2324 Buff grinder glowstone dust recipe. drcrazy 2020-01-20 19:38:05 +0300
  • f7c664fc25 Update mappings modmuss50 2020-01-18 18:00:04 +0000
  • d01ada5353 add developer-mode modmuss50 2020-01-17 17:07:27 +0000
  • 2fb7436e4b 1.15.2-pre2 modmuss50 2020-01-16 19:52:18 +0000
  • 1202a1c588 1.15.2 - mainly mapping updates. Will be backwards compatible with 1.15.1 and 1.15 modmuss50 2020-01-15 12:07:52 +0000
  • a543a562b2 Fix industrial jackhammer AOE mining. Closes #1975 drcrazy 2020-01-14 02:22:06 +0300
  • 2aa2f6d7bb Adjusted recipes for storage units. Closes #1979 drcrazy 2020-01-13 21:42:46 +0300
  • e16e5e3d1d Adjusted recipes for storage units. drcrazy 2020-01-13 21:20:26 +0300
  • 357efe21aa Recipes for fluid tanks upgrades to next tier. Closes #1953 drcrazy 2020-01-13 18:04:52 +0300
  • 70789d3ce0 Sweet berries and kelp got their methane and plantball recipes. Closes #1977 drcrazy 2020-01-13 16:19:54 +0300
  • 728d4affbe Sweet berries centrifuge recipe. Some work on #1977 drcrazy 2020-01-13 15:55:26 +0300
  • 342043dbba Lineup batteries and energy storages. drcrazy 2020-01-13 15:35:59 +0300
  • b9c8a1a215 Slight cleanup. Energy packs uses transfer rates from tier. drcrazy 2020-01-13 13:53:36 +0300
  • 04a1c789c4 Seriously clean up loads of unnecessary item classes and add more configs Prospector 2020-01-12 21:20:42 -0800
  • c4dcc8d870 Move a couple advanced unit recipes in the wrong spot Prospector 2020-01-12 19:29:37 -0800
  • 960b064b5a Fix various issues relating to armor [Fixes #1952] Prospector 2020-01-12 19:17:35 -0800
  • bcc9368bf9 Minor fix to enchanted golden apple's centrifuge recipe Prospector 2020-01-12 18:36:31 -0800
  • 7e6f0d1906 Merge remote-tracking branch 'origin/1.15' into 1.15 modmuss50 2020-01-12 18:40:30 +0000
  • bd25b11908 Turbine rendering, thanks Spearkiller for the textures and model modmuss50 2020-01-12 18:40:21 +0000
  • 0ff1e2b73e (Spearkiller) Properly capitalize advancement titles Justin Vitale 2020-01-12 18:28:31 +1100
  • f2138e034f Fix for fix #1971- Accounted for <= 64 stacks thus not in stored stack Justin Vitale 2020-01-12 09:13:22 +1100
  • eb9abe4c74 Sulfur dust got some usage. Closes #1945 drcrazy 2020-01-11 23:08:00 +0300
  • 3b4d135fd4 Fix #1971 modmuss50 2020-01-11 13:29:22 +0000
  • c1097a5cd8 Get the light from infront of the storage unit modmuss50 2020-01-11 13:18:21 +0000
  • d728cd70d8
    Merge pull request #1972 from vhd/bugfix/reinforced-glass-rendering Justin Vitale 2020-01-11 22:15:51 +1100
  • 9dc063e153 Fix reinforced glass rendering vhd 2020-01-11 11:49:22 +0200
  • 7247b60274 #releaseBuild modmuss50 2020-01-10 23:34:47 +0000
  • e4bc2a0cb7 Powered items should be indestructible now (#1970) vhd 2020-01-10 23:49:14 +0200
  • f1731fe925 Slightly better REI fluid handling. (#1968) vhd 2020-01-10 23:05:05 +0200
  • 9e1b1a76e1 Added config for machines crafting sound (#1969) vhd 2020-01-10 23:03:58 +0200
  • bc47a03451 Keep energy in items when crafting modmuss50 2020-01-10 17:33:20 +0000
  • d1b395f3e4 Cables can now be covered. Thanks to vhd. Closes #1954 vhd 2020-01-10 17:07:02 +0200
  • a115fbd736 Dispenser can use cells. Closes #1948 drcrazy 2020-01-10 16:09:03 +0300
  • 8db5cea07c Refactoring for Scrapbox Dispenser behaviour. drcrazy 2020-01-10 04:01:53 +0300
  • 3f2f186b56 Buff ruby dust to chrome dust recipe. Closes #1955 drcrazy 2020-01-10 01:55:12 +0300
  • 985bef6dae Superconductor cable now craftable. Closes #1962 drcrazy 2020-01-09 17:45:12 +0300
  • 88c0aca954 Fix fusion reactor power gen. Closes #1961 drcrazy 2020-01-09 16:33:32 +0300
  • 5e3341df21 Fix more UU-matter recipes. Kudos to vhd. Closes #1959 vhd 2020-01-09 13:16:24 +0200
  • 39617f61c0 FIx some of UU-matter recipes in a hacky way drcrazy 2020-01-09 13:43:40 +0300