1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Commit Graph

4228 Commits

Author SHA1 Message Date
Sefiraat
5f525fbf74 Java16 Sonar Changes - 8 (done again) 2022-07-02 23:44:39 +01:00
Sefiraat
809530fccd Apply suggestions from code review - 2 2022-07-02 23:39:53 +01:00
Sefiraat
d15e02afbc Merge remote-tracking branch 'upstream/java16' into java16
# Conflicts:
#	src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java
2022-07-02 23:39:38 +01:00
Sefiraat
30e9c879e0 Java16 Sonar Changes - 7 (done) 2022-07-02 22:09:05 +01:00
Sefiraat
dbf55be230 Java16 Sonar Changes - 6 2022-07-02 21:51:08 +01:00
Sefiraat
75375cef45 Remove CT from classifyLocation() 2022-07-02 21:37:15 +01:00
Sefiraat
9f4cb828cb Java16 Sonar Changes - 5 2022-07-02 21:36:15 +01:00
Sefiraat
0f6b6b244c Java16 Sonar Changes - 4 2022-07-02 21:31:03 +01:00
Sefiraat
cd9920b181 Java16 Sonar Changes - 3 2022-07-02 21:13:50 +01:00
Sefiraat
f32dfa4d76 Java16 Sonar Changes - 2 2022-07-02 21:03:20 +01:00
Sefiraat
b4bd9d7acf Java16 Sonar Changes 2022-07-02 20:51:14 +01:00
TheBusyBiscuit
bb9e2dfa4a Impelemented a few instanceof patterns, actually quite nice :) 2022-07-02 21:43:16 +02:00
TheBusyBiscuit
20c3564e8f Initial update to Java 16 2022-07-02 20:49:00 +02:00
JasperChaseTOQ
bff4ca91c0
Update SlimefunItems.java 2022-06-11 20:52:28 -04:00
Jeffrey Kosse
fb5a20c603 updated to 1.19 2022-06-07 21:55:18 +02:00
TheBusyBiscuit
f431aa6dca
Merge pull request #3427 from Slimefun/chore/yeet-chestterminal
Removed ChestTerminal support
2022-04-29 12:26:40 +02:00
TheBusyBiscuit
949eb48fbc
[CI skip] Removed CT as a loadbefore 2022-04-29 12:26:20 +02:00
TheBusyBiscuit
5cfc4f725e Fixed #3548 2022-04-25 18:12:02 +02:00
TheBusyBiscuit
7a2347a027
Merge pull request #3546 from craftish37/master
Added Seagrass recipe (suggestion #398 from Mr.Moules)
2022-04-24 19:26:23 +02:00
craftish37
76444df8f5
Formatting
Co-authored-by: Varian Anora <variananora@outlook.com>
2022-04-22 16:31:27 +02:00
craftish37
1a5c3f024f Forgot to use my damn brain
(Also added Seagrass Fertilizer)
2022-04-22 16:02:21 +02:00
craftish37
3021a8efa9
Added Seagrass recipe (suggestion #398 from Mr.Moules) 2022-04-22 15:19:38 +02:00
itslukemango
7f70570260
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/MachineProcessor.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2022-04-22 12:11:27 +01:00
=
ec79423123 Fix Arithmetic Error 2022-04-20 22:45:04 +01:00
TheBusyBiscuit
217196c137 Fixed #3534 2022-04-19 20:51:13 +02:00
TheBusyBiscuit
429ff50624 Fixed #3504 2022-04-08 18:02:45 +02:00
TheBusyBiscuit
020094e04e Fixed unit tests 2022-03-20 11:38:20 +01:00
TheBusyBiscuit
d3cf518f74 Refactored ItemGroups 2022-03-20 11:21:27 +01:00
haiman
d31275c9ca
Update ColoredMaterial.java 2022-03-16 07:41:05 +08:00
haiman
51bcf3d8b9
Update ColoredMaterial.java 2022-03-15 21:50:44 +08:00
TheBusyBiscuit
114de62942 Fixed #3445 2022-03-14 18:44:48 +01:00
TheBusyBiscuit
495208a089 [CI skip] Updated changelog 2022-03-14 18:19:48 +01:00
ybw0014
e818597b0b
Add shulker box to ColoredMaterial 2022-03-12 16:36:22 -05:00
TheBusyBiscuit
357fee7fff
Merge pull request #3453 from FN-FAL113/fix/industrialminer-bug
Fixes #3336
2022-03-11 12:14:58 +01:00
TheBusyBiscuit
cea7204994 Fixed #3487 2022-03-10 21:00:28 +01:00
TheBusyBiscuit
c88b43717c
[CI skip] Merge pull request #3479 from FN-FAL113/fix/pedestal-bug
Fix pedestal item disappearing (fixes #3476)
2022-03-10 20:51:57 +01:00
TheBusyBiscuit
3432941ba4
[CI skip] Merge pull request #3470 from J3fftw1/master
added rooted dirt to dirt variants (fixes #3469)
2022-03-10 20:48:47 +01:00
Jeffrey Kosse
280440857b fixes #3483 2022-03-09 21:22:08 +01:00
TheBusyBiscuit
dc35bda574
Merge pull request #3451 from FN-FAL113/master
Allow Fluid Pump to fill water bottles
2022-03-09 15:57:46 +01:00
TheBusyBiscuit
e9ab775630
Merge pull request #3448 from StarWishsama/chore/guide-search-improve
Improve guide search result
2022-03-09 15:55:18 +01:00
TheBusyBiscuit
7668a786ca
Merge pull request #3309 from svr333/AddMiddleClickSupport
Implement Middle Click support for Slimefun Items
2022-03-09 14:29:05 +01:00
TheBusyBiscuit
fe2990991c
[CI skip] Merge pull request #3477 from TheSilentPro/additions
unlocalized name and some docs
2022-03-09 14:26:17 +01:00
TheBusyBiscuit
bd3640c7a8 [CI skip] Improved color codes test 2022-03-09 14:13:03 +01:00
The Busy Bot
5adafcda64
[CI skip] New locale updates from Crowdin 2022-03-09 14:12:24 +01:00
The Busy Bot
1e40932dab
[CI skip] New locale updates from Crowdin 2022-03-09 13:12:32 +01:00
FN-FAL113
3c0dadef33
Added missing map import 2022-03-09 08:21:20 +08:00
FN-FAL113
de36da446f
assign return value to a variable and loop values 2022-03-08 21:05:52 +08:00
FN-FAL113
f657016aa8
Update fix comment 2022-03-08 10:12:05 +08:00
FN-FAL113
82941dd8e8
fix a little typo from a comment 2022-03-08 10:10:54 +08:00
FN-FAL113
a11ca349fa
Use the return value of addItem as basis for dropping left overs 2022-03-08 10:06:58 +08:00