Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 65df4d5a9e
  Merge branch 'master' into fix/industrial-miner-bug Jeff 2023-03-04 18:47:18 +0800
• e79091825d
  oopsie fixy FN-FAL113 2023-03-04 18:44:36 +0800
• b0ee2e55da
  Refactor FN-FAL113 2023-03-04 18:39:35 +0800
• 3a054f8d51
  Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/MiningTask.java Jeff 2023-03-04 18:23:20 +0800
• 8197b06682
  Merge pull request #3783 from JustAHuman-xD/fix/energy-integer-overflow TheBusyBiscuit 2023-03-04 11:21:16 +0100
• 8606aa66cc
  [CI skip] Updated changelog TheBusyBiscuit 2023-03-04 11:21:04 +0100
• d542d304f5
  Merge pull request #3779 from variananora/fix/3724 TheBusyBiscuit 2023-03-04 11:12:46 +0100
• 367a0688d9
  Merge pull request #3752 from J3fftw1/feature/bamboo-as-fuel TheBusyBiscuit 2023-03-04 11:12:37 +0100
• ed05f1b854
  Merge pull request #3787 from JustAHuman-xD/fix/android-null-exception TheBusyBiscuit 2023-03-04 11:12:30 +0100
• 8f36b19925
  [CI skip] Updated changelog TheBusyBiscuit 2023-03-04 11:12:22 +0100
• adf5ae7a6f Flip the order of max and min JustAHuman-xD 2023-03-02 09:15:47 -0600
• 7821258589
  Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/NumberUtils.java JustAHuman-xD 2023-03-02 09:11:55 -0600
• 128d091389
  Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java JustAHuman-xD 2023-03-02 09:07:10 -0600
• e32f95bc56 Flip the parameters JustAHuman-xD 2023-03-02 08:17:48 -0600
• 4f37d876a8 Also check if its disabled in that world JustAHuman-xD 2023-03-02 07:57:25 -0600
• 8bbe180334 Add a null check JustAHuman-xD 2023-03-02 07:54:29 -0600
• f08a57e3e6 Check if the soulbound rune is disabled JustAHuman-xD 2023-03-02 07:44:27 -0600
• e7af86c170 Fix #3444 JustAHuman-xD 2023-03-02 07:09:45 -0600
• 9029dbadba Add Unit Tests JustAHuman-xD 2023-03-02 06:44:44 -0600
• cc557a19cf Javadocs JustAHuman-xD 2023-03-02 06:20:00 -0600
• 1d24e832b5 Requested Changes (Next Up Unit Tests) JustAHuman-xD 2023-03-02 06:16:07 -0600
• 137cdc94bf
  [CI skip] Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.11.0 renovate[bot] 2023-03-02 11:20:21 +0100
• 800abe0f3c
  Add Spaces before Or Operators JustAHuman-xD 2023-02-26 09:01:12 -0600
• 736750116c Don't use Optionals for Armorstand JustAHuman-xD 2023-02-26 08:15:16 -0600
• e51f910633 Handle underflow properly JustAHuman-xD 2023-02-26 08:02:22 -0600
• c358eec381 Actually set the Custom Name JustAHuman-xD 2023-02-26 07:46:55 -0600
• edb13b5232 Add ArmorStandUtils & Change AncientPedestal JustAHuman-xD 2023-02-26 07:32:49 -0600
• 34905ebffa Add overflow protection (untested) JustAHuman-xD 2023-02-26 06:28:27 -0600
• ddb7ebd134
  Merge pull request #3778 from Ritwik-main/master TheBusyBiscuit 2023-02-23 16:26:36 +0100
• 038742c9a3
  Merge pull request #3766 from JustAHuman-xD/api/energy-net-changes TheBusyBiscuit 2023-02-23 16:26:25 +0100
• ad2b425cd6
  [CI skip] Updated changelog TheBusyBiscuit 2023-02-23 16:25:57 +0100
• 0622261e86
  Update src/main/resources/tags/climbing_pick_strong_surfaces.json Ritwik-main 2023-02-23 13:25:02 +0530
• d111b1bffb
  Update src/main/resources/tags/climbing_pick_strong_surfaces.json Ritwik-main 2023-02-23 13:24:55 +0530
• da3f6bd049 more blocks for climbing pickaxe take 3? Ritwik-main 2023-02-23 13:15:48 +0530
• bf11828e34 make mud not required Varian Anora 2023-02-23 14:44:52 +0700
• b81f2cc0a0 Revert "adding more blocks to climbing pickaxe table" Ritwik-main 2023-02-23 13:02:55 +0530
• 66140e79ee adding more blocks to climbing pickaxe table Ritwik-main 2023-02-23 12:44:08 +0530
• e2df602c30 Revert "updated climbing pickaxe" Ritwik-main 2023-02-23 12:37:36 +0530
• eb1bdc464c updated climbing pickaxe Ritwik-main 2023-02-23 12:34:03 +0530
• d87b508e27
  [CI skip] Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.5.0 renovate[bot] 2023-02-20 03:04:47 +0100
• 4de76869c2
  [CI skip] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0-M9 renovate[bot] 2023-02-18 20:56:12 +0100
• 41f7f9a914
  [CI skip] New locale updates from Crowdin The Busy Bot 2023-02-12 21:49:04 +0100
• 4f1949fb2e
  [CI skip] Update translators list TheBusyBiscuit 2023-02-12 21:25:42 +0100
• f4440b9b2d
  Apply suggestions from code review TheBusyBiscuit 2023-02-11 15:10:26 +0100
• 6f2a4e369a
  Specify within this instance JustAHuman-xD 2023-02-11 07:43:19 -0600
• 08af8b2f99
  Apply suggestions from code review Daniel Walsh 2023-02-11 00:01:20 +0000
• 2a012cd9c3 Javadoc Changes JustAHuman-xD 2023-02-10 16:45:12 -0600
• 33d4741449 Add Javadocs JustAHuman-xD 2023-02-10 16:20:52 -0600
• 29757f1379
  Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/energy/EnergyNet.java JustAHuman-xD 2023-02-10 16:03:37 -0600
• 17d2ffd731
  [CI skip] Update actions/setup-java action to v3.10.0 renovate[bot] 2023-02-10 22:53:30 +0100
• e7372064d5 Requested Changes JustAHuman-xD 2023-02-10 13:05:50 -0600
• 424b889588 Add API Methods & Small Cleanup JustAHuman-xD 2023-02-10 12:46:55 -0600
• 91156fa0d7
  Remove version check svr333 2023-02-03 13:59:47 +0100
• b4083a480f
  [CI skip] Update dependency org.mockito:mockito-core to v5.1.1 renovate[bot] 2023-01-31 19:49:27 +0100
• 4bfc4f06fb
  Merge pull request #3695 from J3fftw1/chore/some-chores TheBusyBiscuit 2023-01-30 18:00:25 +0100
• 434ee3b6f2
  Merge pull request #3756 from J3fftw1/fix/3741 TheBusyBiscuit 2023-01-30 17:54:27 +0100
• 1d5d5fc680
  [CI skip] Update changelog TheBusyBiscuit 2023-01-30 17:53:53 +0100
• d463f50e85
  [CI skip] Update dependency org.mockito:mockito-core to v5.1.0 renovate[bot] 2023-01-30 17:49:39 +0100
• c21e2f3076 Fix smelting null items J3fftw1 2023-01-30 16:33:09 +0100
• fc5375cb49 fix sadle dupe J3fftw1 2023-01-30 16:08:25 +0100
• 234923e618 adjusted the value J3fftw1 2023-01-25 12:45:03 +0100
• efab9186f9 Added bamboo as a fuel type for androids J3fftw1 2023-01-25 12:41:06 +0100
• 84aaaa8a25
  Merge pull request #3746 from J3fftw1/feature/More-use-for-cobbled-deepslate Daniel Walsh 2023-01-24 19:47:38 +0000
• 741ebdf89b
  [CI skip] Merge pull request #3751 from J3fftw1/master TheBusyBiscuit 2023-01-24 14:22:26 +0100
• d662306058
  Update CHANGELOG.md J3fftw 2023-01-24 14:14:32 +0100
• 5ec2842c91
  [CI skip] Update dependency org.mockito:mockito-core to v5 renovate[bot] 2023-01-24 14:12:20 +0100
• 243d0b8a76
  Apply suggestions from code review J3fftw 2023-01-24 14:05:27 +0100
• 2dd94b93f9 stupid auto format J3fftw1 2023-01-24 13:50:29 +0100
• 666d005849 updated readme, bug report form, pull request form and other comments. J3fftw1 2023-01-24 13:48:39 +0100
• 50940b509d added to the AutoDisenchanter J3fftw1 2023-01-22 16:42:04 +0100
• c204b8213c changed it to int range setting J3fftw1 2023-01-22 16:32:10 +0100
• 0edf0a41f3 requested changes J3fftw1 2023-01-22 16:28:58 +0100
• 1e5dd0af64 changed it to int range setting J3fftw1 2023-01-22 16:15:07 +0100
• de318ce88c added to AbstractEnchantmentMachine J3fftw1 2023-01-22 16:06:55 +0100
• c154302d0b
  [CI skip] Update thollander/actions-comment-pull-request action to v2.3.1 renovate[bot] 2023-01-22 15:30:57 +0100
• e6c9a5b8cd
  [CI skip] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0-M8 renovate[bot] 2023-01-22 15:30:28 +0100
• 4800ab8336
  [CI skip] Update dependency org.junit.jupiter:junit-jupiter to v5.9.2 renovate[bot] 2023-01-22 15:29:40 +0100
• ec3ce7315e
  Merge pull request #3646 from ybw0014/chore/drop-low-version Daniel Walsh 2023-01-22 11:28:17 +0000
• 1a6a2a07a8 added comma in comment J3fftw1 2023-01-21 23:16:13 +0100
• 0824768a14 added a way to set max enchants to go on an item J3fftw1 2023-01-21 23:15:03 +0100
• 02bf0e7b2b more use for cobbled deepslate J3fftw1 2023-01-19 09:11:55 +0100
• 77f2c91d05
  [CI skip] Merge pull request #3739 from Slimefun/chore/update-changelog-for-rc-34 TheBusyBiscuit 2023-01-07 17:28:51 +0100
• 856aedb6c5
  [CI Skip] RC 34 is next up Daniel Walsh 2023-01-07 15:40:06 +0000
• b78c17b362
  [CI skip] Schedule next RC for today TheBusyBiscuit 2023-01-07 15:20:34 +0100
• 3ae41d59f3
  Merge pull request #3737 from Sefiraat/chore/update_changelog TheBusyBiscuit 2023-01-07 13:01:46 +0100
• 18eea27817 Update changelog Sefiraat 2023-01-06 13:05:27 +0000
• fce192b45f
  Merge pull request #3706 from ybw0014/fix/nested-itemgroup Daniel Walsh 2023-01-05 19:59:39 +0000
• 5fe73fd3e5
  [CI Skip] Merge pull request #3716 from Slimefun/renovate/actions-setup-java-3.x Daniel Walsh 2023-01-05 19:57:28 +0000
• c666f39630
  [CI skip] Update thollander/actions-comment-pull-request action to v2 renovate[bot] 2023-01-05 20:56:58 +0100
• 4924d4d8df
  [CI Skip] Merge pull request #3708 from Slimefun/renovate/com.konghq-unirest-java-3.x Daniel Walsh 2023-01-05 19:56:33 +0000
• 03ee9f18ed
  [ci skip] Merge pull request #3734 from Slimefun/renovate/actions-checkout-3.x Daniel Walsh 2023-01-05 19:45:14 +0000
• a07d289fce
  Update actions/checkout action to v3.3.0 renovate[bot] 2023-01-05 16:07:18 +0000
• 1272148191
  Merge pull request #3725 from ybw0014/chores/cscorelib Daniel Walsh 2023-01-05 02:34:17 +0000
• fbf3a20962
  [CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.218 renovate[bot] 2023-01-05 03:33:10 +0100
• d1ac14c8d6
  [CI skip] Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.13 renovate[bot] 2023-01-05 03:32:43 +0100
• 26e3329a82
  [CI skip] Update dependency com.sk89q.worldedit:worldedit-core to v7.2.13 renovate[bot] 2023-01-05 03:32:17 +0100
• ccc8806d90
  [CI skip] Update actions/checkout action to v3.2.0 renovate[bot] 2023-01-05 03:31:50 +0100
• 6906014017
  [CI skip] Update dependency io.papermc:paperlib to v1.0.8 renovate[bot] 2023-01-05 03:30:33 +0100
• 83e8eff6cd
  Merge pull request #3733 from justtos/patch-1 Daniel Walsh 2023-01-05 00:32:55 +0000
• 7d5c31c285
  Update to a better disabled check justtos 2023-01-04 23:11:39 +0200