1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Commit Graph

8161 Commits

Author SHA1 Message Date
Phoenix-Starlight
67af02ce82
Enforce LF endings automatically (#3946) 2023-08-30 02:20:47 +01:00
Sfiguz7
68edac523e
Merge pull request #3924 from iTwins/fix/sensitive_blocks_explosive_tools 2023-08-26 17:30:27 +02:00
Sfiguz7
27ed35ee1c
Merge pull request #3941 from iTwins/fix/soulbound_backpack 2023-08-26 17:30:06 +02:00
Sfiguz7
4c1da3c960
Merge pull request #3944 from iTwins/fix/protection_manager_place_block 2023-08-26 17:29:42 +02:00
Sfiguz7
b0c351fcb7
Merge pull request #3959 from Skizzles/master 2023-08-26 12:29:40 +02:00
Skizzles
b15d7286b3
Update pom.xml
Updates dough to version d3b0997226, this fixes HuskTowns breaking Slimefun4 functionality.
2023-08-26 02:10:06 -07:00
iTwins
66feb7f387 change BREAK_BLOCK to PLACE_BLOCK in BlockPlaceEvent 2023-08-11 23:29:32 +02:00
Sefiraat
7da1af0383
Merge pull request #3914 from variananora/fix/add-cherry-log-to-android-woodcutter
Add cherry log to android woodcutter (Fixes #3913)
2023-08-10 14:22:19 +01:00
iTwins
53cb0d93dc Fix unable to craft soulbound backpack with woven backpack with id (#3939) 2023-08-09 00:25:02 +02:00
renovate[bot]
baef038179
[CI skip] Update thollander/actions-comment-pull-request action to v2.4.2 2023-08-06 23:17:13 +02:00
Daniel Walsh
8bcf0735e5
Added new flags for timings (#3246)
Co-authored-by: JustAHuman-xD <65748158+JustAHuman-xD@users.noreply.github.com>
Co-authored-by: qwertyuioplkjhgfd <qwertyuioplkjhgfd@users.noreply.github.com>
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>
Co-authored-by: Jeffrey <jeffrey@kosse.me>
2023-08-05 19:42:29 +01:00
Violet-Nonbloosom
16313ef8a2
Fix Soulbound Runes not working (#3932) 2023-08-01 22:58:44 +01:00
renovate[bot]
1bdc02283b
[CI skip] Update actions/setup-java action to v3.12.0 2023-08-01 13:44:47 +02:00
renovate[bot]
0c21618cab
[CI skip] Update dependency org.junit.jupiter:junit-jupiter to v5.10.0 2023-08-01 13:44:20 +02:00
Jeroen
b117d87c3f
Change Energized GPS Transmitter values to follow the pattern of previous tiers (#3915)
Co-authored-by: Jeroen <j.teriele1@students.uu.nl>
2023-08-01 12:40:07 +01:00
Fhoz
10629416fd
Add Enchanted Golden Apple recipe (suggestion #2147 from punished_Garett) (#3591) 2023-08-01 12:38:07 +01:00
Phoenix-Starlight
ce213fcdf7
Add blackstone recipes to Grindstone and Ore Crusher (#3912) 2023-08-01 12:36:22 +01:00
Jeroen
5d5000fa0f
Add filter to researches for sf stats completion calculation (#3917)
Co-authored-by: Jeroen <j.teriele1@students.uu.nl>
2023-08-01 00:48:56 +01:00
Jeroen
ede45dd379
Deobfuscate blocks when gold panning (#3921)
Co-authored-by: Jeroen <j.teriele1@students.uu.nl>
2023-08-01 00:48:11 +01:00
Jeroen
fe99cbd451
fixed grappling hook not working due to bat dying (#3926)
Co-authored-by: Jeroen <j.teriele1@students.uu.nl>
2023-07-29 17:10:17 +01:00
Jeroen
4398098dec correctly handle sensitive blocks above blocks broken with explosive tool 2023-07-28 23:05:43 +02:00
Sfiguz7
ca85798b0b
Merge pull request #3923 from JustAHuman-xD/fix/not-caught-versioning-ancient-pedestal-error
Patch for #3922
2023-07-27 14:17:54 +02:00
Sefiraat
6212dfffed
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/AncientAltarListener.java
Co-authored-by: Varian Anora <variananora@outlook.com>
2023-07-27 07:08:30 +01:00
JustAHuman-xD
74624e6e6d Remove version dependent method 2023-07-26 22:46:29 -05:00
Varian Anora
e71e2c8559 Add cherry log to android woodcutter 2023-07-21 09:49:51 +07:00
Sfiguz7
dc22e66589
Merge pull request #3893 from JustAHuman-xD/feature/soul-soil-recipe
Gold Pan Rework (Continuation of #3269)
2023-07-14 15:42:35 +02:00
Sfiguz7
f2fb911ec2
Merge pull request #3784 from JustAHuman-xD/fix/ancient-pedestal
Ancient Pedestal Fixes
2023-07-12 14:21:26 +02:00
Sfiguz7
6bbf46b1d9
Merge pull request #3907 from Sefiraat/fix/exp_collector_performance 2023-07-11 18:40:11 +02:00
Sfiguz7
2ef2e503f6
Merge pull request #3864 from justtos/master 2023-07-11 18:29:53 +02:00
Sefiraat
378a78ee69 Further code improvements 2023-07-11 17:29:05 +01:00
Sefiraat
d543bafb20 Skip fits checks 2023-07-11 16:55:09 +01:00
Sefiraat
eb30d1ff66
Add grace periods to RadiationTask (#3902) 2023-07-11 15:03:58 +01:00
Daniel Walsh
e00cac47c1 Improve performance for clearAllBlockInfoAtChunk 2023-07-11 10:02:53 +01:00
renovate[bot]
0d2c24f9d8
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.222 2023-07-10 23:20:23 +02:00
Sefiraat
240024e664
[CI Skip] Merge pull request #3899 from Sefiraat/chore/forks_merge_conflicts
Stop errors on forks
2023-07-10 15:32:19 +01:00
Sefiraat
632a1a713d Stop errors on forks 2023-07-09 19:46:43 +01:00
The Busy Bot
ce3a8f909b
[CI skip] New locale updates from Crowdin 2023-07-09 20:07:47 +02:00
J3fftw
aebab92e61
Fix some of the reported blocks not working (#3848) 2023-07-09 17:16:10 +01:00
J3fftw
b04cfcc169
Removed backwards compatiblity mode (#3896) 2023-07-09 17:10:46 +01:00
Jeffrey
59a98f1759 possibly fix javadocs 2023-07-09 13:29:54 +01:00
JustAHuman-xD
e5dd21881a Suggested Changes (missed this whoops) 2023-07-08 17:43:13 -05:00
JustAHuman-xD
9108d7dfeb Suggested Changes 2023-07-08 17:41:57 -05:00
J3fftw
5b458f1623
Cumulative Armor-Scheduling changes (Rainbow Armor + Radiation update) (#3892)
* armor task continuation

* added empty line

* requested changes

* Dirty bandage fix armor not working in creative

* rainbow armor clean up

* fixed radiation - not sure if this is the intended way

* ugly fix

* clean up

* requested changes

* import order

* made tiny uranium radiactive

* requested changes

* missed import from comment

* made it gold

* requested changes and actually make solar helmet work

* requested cahnges
2023-07-08 17:10:21 +01:00
renovate[bot]
4fccf2bee9
[CI skip] Update dependency com.konghq:unirest-java to v3.14.5 2023-07-08 16:52:08 +02:00
Daniel Walsh
763822b291 Update CHANGELOG and README 2023-07-07 19:53:56 +01:00
Sefiraat
4e35f62e0e
Adding ExternallyInteractable (#3788)
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2023-07-07 18:55:35 +01:00
Daniel Walsh
36ffc86c6e fix preview builds 2023-07-07 09:39:15 +01:00
Sfiguz7
8241f65de1
Merge pull request #3894 from Slimefun/chore/add-ver-to-preview-builds
Cleanup and add version to preview builds
2023-07-07 10:27:13 +02:00
Daniel Walsh
c0e0b64fea
Move to PR workflow and out of usual push workflow 2023-07-07 09:07:46 +01:00
Daniel Walsh
4b402825ca
Use hash in preview build 2023-07-07 08:47:41 +01:00