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

4216 Commits

Author SHA1 Message Date
Timotiyadeyhakesem
33d265a779 Translate researches_he.yml via GitLocalize 2021-01-20 13:51:30 +00:00
Eylonnn
480f5d949d Translate researches_he.yml via GitLocalize 2021-01-20 13:51:29 +00:00
Omer Oreg
af630a6e4c Translate researches_he.yml via GitLocalize 2021-01-20 13:51:27 +00:00
TheBusyBiscuit
f0b0e77fd5
[CI skip] Merge pull request #2743 from Slimefun/gitlocalize-14837
Translated the new string
2021-01-20 14:20:25 +01:00
Nikolay
b13daf886b Translate messages_bg.yml via GitLocalize 2021-01-20 13:12:31 +00:00
bito-blosh
50e1e02118 Translate messages_ja.yml via GitLocalize 2021-01-20 13:07:47 +00:00
TheBusyBiscuit
b47fbf60ff Translate messages_ja.yml via GitLocalize 2021-01-20 13:07:45 +00:00
Daniel Walsh
346fc7bc44
Merge pull request #2733 from Seggan/master 2021-01-20 12:35:07 +00:00
TheBusyBiscuit
fcafc125c7
[CI skip] Merge pull request #2740 from Slimefun/gitlocalize-14829
messages_es
2021-01-20 10:55:24 +01:00
TheBusyBiscuit
5c3f815a77
[CI skip] Merge pull request #2739 from Slimefun/gitlocalize-14828
researches_es
2021-01-20 10:53:22 +01:00
Luu7
15e95846a5 Translate recipes_es.yml via GitLocalize 2021-01-19 19:02:37 +00:00
KhronoZ
89c030340c Translate messages_es.yml via GitLocalize 2021-01-19 18:52:47 +00:00
Luu7
c410d7ea4e Translate messages_es.yml via GitLocalize 2021-01-19 18:52:46 +00:00
Luu7
842cc9b791 Translate researches_es.yml via GitLocalize 2021-01-19 18:52:27 +00:00
TheBusyBiscuit
591421fc32 [CI skip] Fixed javadocs 2021-01-19 10:01:55 +01:00
TheBusyBiscuit
9840a550ce [CI skip] Changed internal profiler flag to a volatile boolean 2021-01-19 10:01:28 +01:00
TheBusyBiscuit
4075c51975 [CI skip] Refactoring and improved logging 2021-01-18 23:29:44 +01:00
Seggan
3fac23e26b Fine 2021-01-18 16:03:19 -05:00
Seggan
31a1d7b3b2 Localization + removed redundant 1st check 2021-01-18 09:41:38 -05: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
Seggan
e1810f60ff Oops 2021-01-16 12:01:27 -05:00
Seggan
2e7291c3a5 Script validation 2021-01-16 11:38:19 -05: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