Commit graph

  • 2211632f5c Just enough brewing PepperCode1 2022-03-12 00:04:05 -0800
  • eef9410103 fix #195, fix #192 TropheusJ 2022-03-11 22:08:13 -0500
  • 71e18eb505 Politeness Intensifies simibubi 2022-03-11 23:37:41 +0100
  • 867f9ceae8
    Update ko_kr.json qkrehf2 2022-03-11 21:52:01 +0900
  • af66eba28d fix like a lot of transfer issues probably including #185 and #114 TropheusJ 2022-03-10 19:14:37 -0500
  • 07057eba80 Bump parchment version to 2022.03.06 tansheron 2022-03-09 23:01:22 -0800
  • 718849645c fix #184 TropheusJ 2022-03-09 22:25:16 -0500
  • 7d67517302 bump lib oh yeah also the maven changed TropheusJ 2022-03-09 22:21:50 -0500
  • 7ba4af1bea Bulk Wrenching simibubi 2022-03-10 02:04:44 +0100
  • 9e0f35e4d7 Reincartnated simibubi 2022-03-09 21:33:28 +0100
  • 1f8c28dad5 All Game Elements dumitru andrei 2022-03-09 21:04:34 +0200
  • b3a1110733 bump lib, prevent data loss TropheusJ 2022-03-08 21:39:37 -0500
  • d9ae7ffbf9 remove fish mode (fix #181) TropheusJ 2022-03-08 21:08:11 -0500
  • ed6712fd0b TCP Handbrake simibubi 2022-03-09 02:21:20 +0100
  • 8341b0f74b right, we made changes TropheusJ 2022-03-08 18:10:54 -0500
  • f177c408a4 fix #173 TropheusJ 2022-03-08 18:08:53 -0500
  • d8ecb44e9d fix ghosts TropheusJ 2022-03-08 17:33:42 -0500
  • 0e3be5d209 Merge remote-tracking branch 'create/mc1.18/dev' into mc1.18/fabric/dev TropheusJ 2022-03-08 17:28:33 -0500
  • 9fe4aee271
    Merge pull request #2846 from mezz/can-compress-performance PepperCode1 2022-03-08 10:08:09 -0800
  • fa47939428 Catching up simibubi 2022-03-08 18:03:57 +0100
  • 6432aae289 First 100 Elements - Game Elements dumitru andrei 2022-03-08 13:26:41 +0200
  • fcec6566fa
    Improve the performance of MechanicalPressTileEntity#canCompress mezz 2022-03-07 17:22:15 -1000
  • 6d9f3ca80e merge cleanup TropheusJ 2022-03-07 22:18:21 -0500
  • 9629cb84eb Look ma, both threads! simibubi 2022-03-08 03:51:03 +0100
  • f7d9e00afb Merge remote-tracking branch 'create/mc1.18/dev' into mc1.18/fabric/dev TropheusJ 2022-03-07 21:20:48 -0500
  • 1ac5efa9d3 Compatibility with "Pam's HarvestCraft" mod Maxim Terlyck 2022-03-06 01:46:51 +0300
  • ca57350448 Сompatibility with "Croptopia" mod Maxim Terlyck 2022-03-06 01:27:59 +0300
  • fa4a0e7261 Limiting the infinite PepperCode1 2022-03-05 01:45:39 -0800
  • fc361932d6 fix #171 TropheusJ 2022-03-05 03:09:19 -0500
  • d449ee670b oops TropheusJ 2022-03-05 03:06:25 -0500
  • 330744adda finalize port lib move TropheusJ 2022-03-05 03:04:59 -0500
  • c1df726063 initial move to port lib TropheusJ 2022-03-05 00:58:37 -0500
  • 3c64ada850 The Client is always right simibubi 2022-03-04 18:30:18 +0100
  • 2b21358353 merge cleanup TropheusJ 2022-03-03 21:57:14 -0500
  • eabdbf413c Merge remote-tracking branch 'create/mc1.18/dev' into mc1.18/fabric/dev TropheusJ 2022-03-03 21:47:38 -0500
  • 668e4c0271 Merge remote-tracking branch 'origin/mc1.18/fabric/dev' into mc1.18/fabric/dev TropheusJ 2022-03-03 21:40:25 -0500
  • 884673b6f8 fix #164 probably fix #168 TropheusJ 2022-03-03 21:40:16 -0500
  • a99af2aa9f reduce white space diff lcy0x1 2022-03-03 13:50:33 -0800
  • d0859ea44c reduce white space diff lcy0x1 2022-03-03 13:48:47 -0800
  • 74a28f0335 reduce white space diff lcy0x1 2022-03-03 13:47:51 -0800
  • dbb10da1a2 reduce white space diff lcy0x1 2022-03-03 13:46:46 -0800
  • d0d6d360d2 reduce white space diff lcy0x1 2022-03-03 13:45:42 -0800
  • e3066dd3f1 reduce white space diff lcy0x1 2022-03-03 13:44:19 -0800
  • cb83b4c162 use file name as name lcy0x1 2022-03-03 13:31:29 -0800
  • 67de2c7f2e fix import and naming format lcy0x1 2022-03-03 13:06:05 -0800
  • b6e3dfacff regenerate resources lcy0x1 2022-03-03 12:31:27 -0800
  • 624cb831d5 Merge branch 'mc1.18/dev' into custom_fan_processing lcy0x1 2022-03-03 12:23:43 -0800
  • 97ea78e852 Post-PR Datagen simibubi 2022-03-03 18:10:35 +0100
  • 180e2fd01b
    Updates to fr_fr.json by HollishKid (#2808) Hollish 2022-03-03 17:58:33 +0100
  • bfab1d30c2
    Updates to ko_kr.json by qkrehf2 (#2805) qkrehf2 2022-03-04 01:52:12 +0900
  • cef481653e
    Updates to ja_jp.json by CKenJa (#2780) CKenJa 2022-03-04 01:42:00 +0900
  • 6315749cf6
    Updates to zh_cn.json by Demonese (#2717) 璀境石 2022-03-04 00:40:05 +0800
  • 50bc6f49e4
    Updates to pt_br.json by vyhi (#2598) vyhi 2022-03-03 13:38:30 -0300
  • e69732f818
    Updates to es_es.json by muriplz (#2523) muriplz 2022-03-03 17:35:45 +0100
  • 2a3aa5955b
    Merge pull request #2745 from FortressNebula/mc1.18/dev simibubi 2022-03-03 17:27:38 +0100
  • 9aa1611d78
    Merge pull request #2670 from rsaihe/mc1.18/dev simibubi 2022-03-03 17:20:49 +0100
  • d522ec70a3
    Merge pull request #2788 from jaredlll08/mc1.18/dev simibubi 2022-03-03 17:19:23 +0100
  • e7a273e678 Tunnel touch-ups simibubi 2022-03-03 17:18:53 +0100
  • 596802d3cc Phantom Slots simibubi 2022-03-03 15:42:00 +0100
  • 21ad6125f5
    Merge pull request #2597 from lcy0x1/funnel-fix simibubi 2022-03-03 15:07:32 +0100
  • ccd4833148 Splash of Smoke simibubi 2022-03-03 14:51:27 +0100
  • 8ec3b9ca4c add block item display lcy0x1 2022-03-03 00:09:07 -0800
  • bc560be6ed add blocks and fluids to ingredients lcy0x1 2022-03-02 23:26:29 -0800
  • 1ab4b5ea06 use resource locations for ID lcy0x1 2022-03-02 22:53:25 -0800
  • 5f516f44ff Improve Simple Networking API PepperCode1 2022-03-02 19:15:33 -0800
  • 913ffa7ba6 throw error when block not found lcy0x1 2022-03-02 17:38:26 -0800
  • 8262f222c2 color parse check lcy0x1 2022-03-02 17:08:53 -0800
  • 477a30bcaa add custom recipe lang entry lcy0x1 2022-03-02 16:58:21 -0800
  • a036525a20 add comments explaining how the config works lcy0x1 2022-03-02 16:53:06 -0800
  • ee2be7bd9d Update es_es.json Albertosaurio65 2022-03-03 01:10:12 +0100
  • fade2039ac use objects instead of resource locations when possible lcy0x1 2022-03-02 16:03:10 -0800
  • 4b2a0075ea Update es_es.json Albertosaurio65 2022-03-02 23:49:44 +0100
  • 15f50fc082 Update es_es.json Albertosaurio65 2022-03-02 23:47:45 +0100
  • e4aca955a8 follow java naming conventions lcy0x1 2022-03-02 14:31:24 -0800
  • cac429bb3d apply editor config formatting lcy0x1 2022-03-02 14:19:51 -0800
  • 70eb9e24c4 apply editor config formatting lcy0x1 2022-03-02 14:18:41 -0800
  • 126aab9d6c revert import changes for CreateJEI lcy0x1 2022-03-02 13:54:44 -0800
  • 9b81239292 fix import order lcy0x1 2022-03-02 13:50:36 -0800
  • 2046f0d956 fix method order lcy0x1 2022-03-02 13:44:21 -0800
  • b4f95c67a6 Merge branch 'mc1.18/dev' into custom_fan_processing lcy0x1 2022-03-02 13:42:16 -0800
  • ae62389778 switch to resource location for IDs lcy0x1 2022-03-02 13:35:08 -0800
  • 4ead95eae5 remove extra white space lcy0x1 2022-03-02 00:01:05 -0800
  • 39f7730155 remove extra whitespace lcy0x1 2022-03-01 23:59:07 -0800
  • 5f56def84e remove extra whitespace lcy0x1 2022-03-01 23:56:28 -0800
  • 097b427c7b remove extra whitespace lcy0x1 2022-03-01 23:55:04 -0800
  • d824969a60 remove unnecessary code lcy0x1 2022-03-01 23:41:03 -0800
  • 9069dd760d fix conflict lcy0x1 2022-03-01 23:14:19 -0800
  • 1b3b741191 Merge branch 'mc1.18/dev' into merged lcy0x1 2022-03-01 23:09:18 -0800
  • f99d9cae2f Merge branch 'mc1.18/dev' into merged merge lcy0x1 2022-03-01 23:03:10 -0800
  • d52d1a2e1a Merge branch 'funnel-fix' into merged merge lcy0x1 2022-03-01 23:02:46 -0800
  • b7dea5c7ed Merge branch 'overflow-fix' into merged merge lcy0x1 2022-03-01 23:02:13 -0800
  • e9582d3b41 update credit TropheusJ 2022-03-01 20:42:47 -0500
  • 3362e6a05e Signal Station simibubi 2022-02-28 22:52:14 +0100
  • df83058d33
    fix mechanical_mixer item model cogwheel broken XeKr 2022-02-27 17:33:43 +0800
  • ae54644bcf
    fix mechanical_crafter item model cogwheel broken XeKr 2022-02-27 17:31:55 +0800
  • 174cfc9ed3
    fix belt_tunnel side textures' wrong stretching XeKr 2022-02-27 17:29:20 +0800
  • 69e9871185 Merge remote-tracking branch 'origin/mc1.18/fabric/dev' into mc1.18/fabric/dev TropheusJ 2022-02-25 15:59:01 -0500
  • adc4183e37 fix #160 + some cleanup TropheusJ 2022-02-25 15:56:09 -0500
  • 474584854a Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.18/fabric/dev PepperCode1 2022-02-24 18:21:02 -0800
  • 6420f54194 Add tags for blaze burner fuel PepperCode1 2022-02-24 17:32:33 -0800