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

8372 Commits

Author SHA1 Message Date
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
JustAHuman-xD
506cd65a18 add since 2023-07-05 23:49:56 -05:00
JustAHuman-xD
d0cb47f947 Fix NPE 2023-07-05 11:43:06 -05:00
Sfiguz7
82c9c57355
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AutomatedPanningMachine.java 2023-07-05 14:01:30 +02:00
Sfiguz7
2aa526c34e
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AutomatedPanningMachine.java
Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>
2023-07-05 08:33:31 +02:00
JustAHuman-xD
1161893478 Fix Different Time of Pan Recipes 2023-07-04 17:33:32 -05:00
JustAHuman-xD
fcb1a791c0 Fix whitespace 2023-07-04 16:49:11 -05:00
JustAHuman-xD
2b4681ea7b Add Old Methods as Deprecated 2023-07-04 16:46:58 -05:00
JustAHuman-xD
a7605a64b4 Javadocs & small adjustments 2023-07-04 15:27:33 -05:00
JustAHuman-xD
103bd8bbd4 Forward & Update svr's changes 2023-07-04 15:10:40 -05:00
Sfiguz7
75a781d3d6
Merge pull request #3887 from JustAHuman-xD/fix/compressor-double-recipe 2023-07-03 08:26:57 +02:00
Sfiguz7
a5a5a771b3
Merge pull request #3888 from Slimefun/fix/longfallboots-breaking-change 2023-07-03 08:21:51 +02:00
Daniel Walsh
8b2d22da50
Fix breaking change in LongFallBoots 2023-07-03 00:34:56 +01:00
JustAHuman-xD
82c9252761 Fix Compressor doubling output 2023-07-02 17:20:25 -05:00
Sefiraat
934ab822a6
DistinctiveItem/isSimilar + Backpack canStack (#3417)
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
2023-07-02 21:51:51 +01:00
Sfiguz7
1beeb8fd8e
Merge pull request #3795 from JustAHuman-xD/fix/multiblock-shifting-recipes 2023-06-30 21:17:00 +02:00
JustAHuman-xD
1d4453e2dd
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlockMachine.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2023-06-30 04:56:34 -05:00
JustAHuman-xD
a1a1d865a9
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlockMachine.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2023-06-30 04:56:28 -05:00
Sfiguz7
ad70204587
Merge pull request #3883 from Slimefun/fix/1.16-compat 2023-06-30 07:39:20 +02:00
Daniel Walsh
f7e00a0ccc
Fixed 1.16 compat 2023-06-30 06:29:02 +01:00
JustAHuman-xD
cb84d9abd5
Revert header changes (#3882) 2023-06-30 05:08:36 +01:00
J3fftw
f0ac184c5b
Implement new sound system (#3880)
Co-authored-by: TheBusyBiscuit <mrCookieSlime@gmail.com>
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2023-06-29 21:43:43 +01:00
TheBusyBiscuit
811933b1eb
[CI Skip] Allow server owners to fully customize sounds (#2844)
Co-authored-by: Senne <vanrompaey.senne@protonmail.com>
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2023-06-29 21:08:09 +01:00
JustAHuman-xD
961ad00dcc Trigger test build workflow 2023-06-28 13:54:27 -05:00
Just_ToS
5862b12eb9 Add suggested changes 2023-06-28 16:38:31 +03:00
JustAHuman-xD
1f407b7a86 Requested Changes 2023-06-28 06:43:42 -05:00
JustAHuman-xD
4f55622d35 Better Javadocs 2023-06-24 17:08:55 -05:00
JustAHuman-xD
7b4f533da5
Suggested Change
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2023-06-24 16:45:07 -05:00
renovate[bot]
b9c6c22f73
[CI skip] Update actions/upload-artifact action to v3 2023-06-24 18:30:32 +02:00
renovate[bot]
e7d0414124 Update actions/github-script action to v6 2023-06-24 17:29:42 +01:00
Daniel Walsh
cab97b1a93 Download artifact by ID, it isn't available in the workflow_run 2023-06-24 17:03:08 +01:00
justtos
b9f6a183d0
Fix comment spacing
Co-authored-by: Phoenix-Starlight <64714532+Phoenix-Starlight@users.noreply.github.com>
2023-06-24 18:42:56 +03:00
justtos
86e0dc2c04
Yet another code style correction
Co-authored-by: JustAHuman-xD <65748158+JustAHuman-xD@users.noreply.github.com>
2023-06-24 18:27:05 +03:00
Just_ToS
ec34ae9399 Another minor code styling correction 2023-06-24 17:56:03 +03:00
justtos
992a4818ac
Minor code styling correction
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
2023-06-24 17:32:42 +03:00
Sfiguz7
a78cc5114c
Merge pull request #3863 from J3fftw1/feature/preview-builds 2023-06-24 13:38:59 +02:00
Daniel Walsh
b393a066f1
Improve messaging 2023-06-24 12:09:25 +01:00
Daniel Walsh
e1f830dac9
Try to work within the perms 2023-06-24 11:40:22 +01:00
Daniel Walsh
0fdccdd177
Fix vars 2023-06-24 11:10:51 +01:00
Sfiguz7
62be0f7708
Merge pull request #3866 from Slimefun/fix/pr-labels 2023-06-24 11:28:29 +02:00