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 |
|
TheBusyBiscuit
|
96f145385d
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
|
2022-03-09 14:12:40 +01:00 |
|
The Busy Bot
|
5adafcda64
|
[CI skip] New locale updates from Crowdin
|
2022-03-09 14:12:24 +01:00 |
|
TheBusyBiscuit
|
d78110b527
|
[CI skip] Added test to catch faulty color codes
|
2022-03-09 13:37:33 +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 |
|
FN-FAL113
|
9ea414bd04
|
Update AncientAltarListener.java
|
2022-03-07 08:39:19 +08:00 |
|
svr333
|
f83fedadbd
|
Add '.' after summary
|
2022-03-05 13:42:14 +01:00 |
|
FN-FAL113
|
de5524ad9a
|
Fix pedestal bug
|
2022-03-05 11:51:45 +08: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 |
|
FN-FAL113
|
b00286e607
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/MiningTask.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2022-01-31 18:12:56 +08:00 |
|
StarWishsama
|
23a11b2f93
|
feat(guide): add config options for show hidden item
|
2022-01-31 12:45:45 +08:00 |
|
FN-FAL113
|
6cc4695e8c
|
Remove nested condition
|
2022-01-31 10:11:00 +08:00 |
|
FN-FAL113
|
45b4268871
|
Industrial miner fix
|
2022-01-31 09:16:17 +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 |
|