mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Code Releases Activity
5,656 Commits 1 Branch 0 Tags 64 MiB
ffef8350b1
Commit Graph

2971 Commits

Author SHA1 Message Date
svr333
ffef8350b1
Merge branch 'master' into performance/cobblestone 2021-01-18 22:18:02 +01:00
TheBusyBiscuit
7eff4d381e Fixed a small issue with backpacks 2021-01-17 14:27:01 +01:00
TheBusyBiscuit
9c3c6d7245 [CI skip] Fixed javadocs 2021-01-17 14:04:51 +01:00
TheBusyBiscuit
eab6164690 Fixed 2021-01-17 12:19:08 +01:00
TheBusyBiscuit
7ca8392616 Improved documentation 2021-01-17 01:48:26 +01:00
TheBusyBiscuit
79c7c4826f Refactoring and documentation 2021-01-17 01:01:42 +01:00
TheBusyBiscuit
16ed670573 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
refactoring/holograms

Conflicts:
	CHANGELOG.md
 2021-01-16 15:56:23 +01:00
TheBusyBiscuit
0feace9c06
Merge pull request #2729 from Slimefun/fix/infused-hopper-picking-up-incorrect-items 
Fix the infused hopper picking up items with pickup delay Short.MAX_VALUE
 2021-01-16 15:51:17 +01:00
TheBusyBiscuit
7758fabcec
Merge pull request #2732 from Slimefun/gitlocalize-14785 
Translated to Bulgarian
 2021-01-16 15:50:38 +01:00
TheBusyBiscuit
03b4c10bad [CI skip] Updated changelog 2021-01-16 14:46:00 +01:00
Nikolay
defad8af32 Translate messages_bg.yml via GitLocalize 2021-01-16 13:13:35 +00:00
DNBGlol
61a30ec8b3 Translate messages_bg.yml via GitLocalize 2021-01-16 13:13:33 +00:00
Daniel Walsh
485fc1aa69
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedHopper.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-01-16 10:39:05 +00:00
Daniel Walsh
ff368bdf56
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedHopper.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-01-16 10:35:03 +00:00
TheBusyBiscuit
34d18c5547
Merge branch 'master' into refactoring/holograms 2021-01-16 11:34:24 +01:00
Daniel Walsh
55d2f82dcd
Merge branch 'master' into fix/infused-hopper-picking-up-incorrect-items 2021-01-16 10:33:16 +00:00
TheBusyBiscuit
7c929a2f22 Fixes #2728 2021-01-16 11:30:39 +01:00
TheBusyBiscuit
e523d7849e Fixes #2662 2021-01-16 11:28:38 +01:00
Daniel Walsh
da2419d414
Fix the infused hopper picking up items with pickup delay Short.MAX_VALUE 2021-01-16 10:26:22 +00:00
TheBusyBiscuit
d678977a03 Fixed formatting, import and small optimization 2021-01-15 11:52:56 +01:00
TheBusyBiscuit
a810458345 [CI skip] Small changes 2021-01-15 11:46:40 +01:00
TheBusyBiscuit
3663a7d43b Proper error handling and updated changelog 2021-01-15 03:31:33 +01:00
TheBusyBiscuit
1997fe04d8 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into refactoring/holograms 2021-01-15 03:12:41 +01:00
TheBusyBiscuit
5ea34a895d Fixed holograms cache 2021-01-15 01:37:55 +01:00
TheBusyBiscuit
3ea2fccf25 Fixed docs 2021-01-15 01:34:56 +01:00
TheBusyBiscuit
570908a448 Cache entity names 2021-01-15 01:32:39 +01:00
TheBusyBiscuit
34f24f4d60 Invisible and invulnerable might be a good idea. 2021-01-15 00:29:28 +01:00
TheBusyBiscuit
d84a2e37a3 Lowered purge delay 2021-01-15 00:24:23 +01:00
TheBusyBiscuit
a7d0758692 More work on holograms 2021-01-15 00:16:58 +01:00
TheBusyBiscuit
84d2d99097 not done yet 2021-01-14 20:44:56 +01:00
TheBusyBiscuit
ac590fdde3 Fixes #2721 2021-01-14 14:41:09 +01:00
TheBusyBiscuit
7826b2359a Finished fix for #2636 and fixed a threading issue with BlockStates 2021-01-14 11:58:52 +01:00
TheBusyBiscuit
43109ab2d3
Merge branch 'master' into performance/cobblestone 2021-01-14 11:16:39 +01:00
Daniel Walsh
2f08066449
Merge pull request #2487 from CURVX/fix/sf-machine-hopper 2021-01-13 18:46:13 +00:00
TheBusyBiscuit
029bc2ae78 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
refactoring/holograms

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HologramProjector.java
 2021-01-13 14:29:18 +01:00
TheBusyBiscuit
6e27ea0ca1 [CI skip] Fixed javadocs 2021-01-13 13:48:56 +01:00
TheBusyBiscuit
faa3219add Added an additional item warning for illegal stack sizes 2021-01-13 13:15:05 +01:00
TheBusyBiscuit
11a368f97e Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-01-13 12:46:35 +01:00
TheBusyBiscuit
b0f5768443 [CI skip] Removed a deprecated method 2021-01-13 12:46:16 +01:00
TheBusyBiscuit
89f6b69e80
[CI skip] Merge pull request #2713 from Slimefun/gitlocalize-14728 
Updated and improve zh-CN Translation
 2021-01-13 12:19:25 +01:00
Nameless
a69226dd76 Translate messages_zh-CN.yml via GitLocalize 2021-01-13 05:23:28 +00:00
CURVX
889ffe4872 Few minor changes 2021-01-13 10:31:45 +05:30
TheBusyBiscuit
7339a6ed4b [CI skip] Refactoring 2021-01-13 02:20:32 +01:00
TheBusyBiscuit
ec8eed58f9 [CI skip] Refactoring 2021-01-12 19:28:12 +01:00
CURVX
a0ab148a65 Cleaned imports pt.2 2021-01-12 23:42:19 +05:30
CURVX
f0e891134b Cleaned imports 2021-01-12 23:17:23 +05:30
CURVX
19e2f37ac6 Resolve merge conflicts 2021-01-12 21:51:31 +05:30
CURVX
b3b7a22ee9 Changes req. by TTB 2021-01-12 21:42:53 +05:30
CURVX
105a57fb37
Merge pull request #6 from Slimefun/master 
[CI skip] Update fork
 2021-01-12 21:37:20 +05:30
TheBusyBiscuit
3f5fb7c7a7 [Ci skip] Fixed javadocs and improved documentation 2021-01-12 12:03:02 +01:00