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

4181 Commits

Author SHA1 Message Date
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
svr333
f83fedadbd
Add '.' after summary 2022-03-05 13:42:14 +01:00
Silent
b7c90fe400 unlocalized name and some docs 2022-03-02 17:02:10 +01:00
Jeffrey Kosse
7dd9cc9d11 added rooted dirt to dirt variants 2022-02-20 21:46:28 +01:00
The Busy Bot
1773ae0a4a
[CI skip] New locale updates from Crowdin 2022-02-06 01:58:00 +01:00
The Busy Bot
bca4d14a56
[CI skip] New locale updates from Crowdin 2022-02-05 11:52:43 +01:00
TheBusyBiscuit
78660f01f4
Update default value 2022-02-02 14:22:54 +01:00
StarWishsama
d82ae5bad6
chore(typo): fix isHiddenItemGroup typo
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2022-02-01 19:12:06 +08:00
StarWishsama
1af533733c
chore(typo): fix config type
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2022-02-01 19:11:44 +08:00
StarWishsama
c7539c5990
improve(guide): rename showHiddenItemInSearch to showHiddenItemGroupsInSearch 2022-02-01 11:39:50 +08:00
StarWishsama
23a11b2f93
feat(guide): add config options for show hidden item 2022-01-31 12:45:45 +08:00
FN-FAL113
edeb4aa1c7
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2022-01-30 22:25:02 +08:00
FN-FAL113
44cf96b7f3
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2022-01-30 22:24:47 +08:00
FN-FAL113
c3cc30e23c
local variables and formatting 2022-01-30 20:18:14 +08:00
FN-FAL113
6132683f00
camelCase non static instance variable 2022-01-30 19:32:36 +08:00
FN-FAL113
da37209bb8
Hopefully resolve request changes 2022-01-30 19:09:16 +08:00
FN-FAL113
ee34322dec
Added support for glass bottle 2022-01-30 10:49:55 +08:00
StarWishsama
ae18ec1114
chore(guide): don't display item that its itemGroup not be unlocked 2022-01-28 18:39:14 +08:00
The Busy Bot
d38dd0d992
[CI skip] New locale updates from Crowdin 2022-01-20 19:29:28 +01:00
Senne
e02e089b7f
Add ParamsAreNonNullByDefault 2022-01-19 17:37:48 +01:00
Senne
0a8aff0695
Merge branch 'master' into AddMiddleClickSupport 2022-01-18 22:01:23 +01:00
TheBusyBiscuit
dd16b7c84c [CI skip] Fixed javadocs 2022-01-18 20:03:52 +01:00
TheBusyBiscuit
e02eedd940
Merge pull request #3275 from Sfiguz7/fix/itemsadder_cargo_stacking
Fixes #3133
2022-01-18 17:52:08 +01:00
Daniel Walsh
3ac8cadbc1
Fix multi-line comment 2022-01-18 14:02:50 +00:00
The Busy Bot
0a1724b63e
[CI skip] New locale updates from Crowdin 2022-01-18 13:31:11 +01:00
Daniel Walsh
220cfc9058
Update dough 2022-01-16 16:54:19 +00:00
TheBusyBiscuit
014f832347 Fixed #3429 2022-01-16 15:02:05 +01:00
TheBusyBiscuit
e8f2a5fc49 [CI skip] Uninitialized ItemSettings will now cause test failures 2022-01-16 14:57:27 +01:00
TheBusyBiscuit
c1074faeb2 Added PlayerProfile#hasUnlockedEverything()
and also updated all workflows to JDK 17
2022-01-16 14:17:50 +01:00
TheBusyBiscuit
6ec11e17ef
Merge pull request #3428 from J3fftw1/feature/VanillaTransformationIceInFreezer
Added vanilla ratios to the freezer
2022-01-15 22:49:24 +01:00
J3fftw
4f2900045a
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/Freezer.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2022-01-15 22:29:22 +01:00
J3fftw
5af5fbf973
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/Freezer.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2022-01-15 18:48:22 +01:00
Jeffrey Kosse
fb3f76e9eb did requested changes 2022-01-15 18:40:39 +01:00
Jeffrey Kosse
155feede96 you are a dog 2022-01-15 18:10:56 +01:00
Jeffrey Kosse
2e94b101ae formatting where? 2022-01-15 18:09:05 +01:00
Jeffrey Kosse
e38a6bf80b formatting where? 2022-01-15 18:08:22 +01:00
Jeffrey Kosse
0d80b295ff fixed imports 2022-01-15 17:57:26 +01:00
Jeffrey Kosse
4aaa6db05f added vanilla transformation to ice 2022-01-15 17:56:18 +01:00
poma123
2bc0313b2a Added a new fromJson method with isLenient parameter 2022-01-15 17:19:50 +01:00
poma123
ecdf4f939c Made BiomeMapParser public 2022-01-14 12:13:21 +01:00
Senne
fc8ffabbcf
Switch to sfItem.isItem() 2022-01-12 22:23:19 +01:00
TheBusyBiscuit
5c1dda32a4 [CI skip] Some unit test changes 2022-01-04 01:30:21 +01:00