Daniel Walsh
|
f65efd95fc
|
Requested changes
|
2021-01-21 20:05:27 +00:00 |
|
Daniel Walsh
|
499a464595
|
Add unit test
|
2021-01-21 19:53:19 +00:00 |
|
Daniel Walsh
|
549b075939
|
Make RechargeableHelper public
|
2021-01-21 19:25:38 +00:00 |
|
TheBusyBiscuit
|
d8aaf00635
|
Merge pull request #2715 from Slimefun/experimental/remove-cscorelib
Experimental: Slimefun but without CS-CoreLib
|
2021-01-21 15:58:38 +01:00 |
|
HeroBrineKing
|
2a0b921e1c
|
Translate messages_zh-TW.yml via GitLocalize
|
2021-01-21 05:06:03 +00:00 |
|
TheBusyBiscuit
|
f4c5fd4898
|
Translate messages_zh-TW.yml via GitLocalize
|
2021-01-21 05:06:02 +00:00 |
|
Just Mango
|
3966c352ee
|
Translate messages_vi.yml via GitLocalize
|
2021-01-20 14:11:46 +00:00 |
|
CactusTheGuy
|
40817f4b48
|
Translate messages_vi.yml via GitLocalize
|
2021-01-20 14:11:45 +00:00 |
|
nahkd123
|
de57194440
|
Translate messages_vi.yml via GitLocalize
|
2021-01-20 14:11:44 +00:00 |
|
TheBusyBiscuit
|
35b2c4a1e4
|
Updated translators list
|
2021-01-20 14:55:03 +01:00 |
|
Molioron
|
4832637501
|
Translate researches_he.yml via GitLocalize
|
2021-01-20 13:51:32 +00:00 |
|
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 |
|
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 |
|
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 |
|
TheBusyBiscuit
|
69df04f128
|
Remove as much old stuff as possible
|
2021-01-13 11:58:54 +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
|
f602c6c575
|
Slimefun but without cs-corelib
|
2021-01-13 02:51:05 +01:00 |
|
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 |
|
TheBusyBiscuit
|
bc8d72b9ab
|
Small aesthetic change
|
2021-01-11 13:12:09 +01:00 |
|
TheBusyBiscuit
|
5ed452660f
|
Fixed elevator order (highest floor first)
|
2021-01-11 13:07:46 +01:00 |
|
TheBusyBiscuit
|
f6a9150296
|
Little bit of refactoring
|
2021-01-11 12:45:11 +01:00 |
|
TheBusyBiscuit
|
7a4712f930
|
Removed obsolete things
|
2021-01-11 12:33:49 +01:00 |
|
TheBusyBiscuit
|
7bfb46d3fd
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/elevator/ElevatorPlate.java
Co-authored-by: Sfiguz7 <37039432+Sfiguz7@users.noreply.github.com>
|
2021-01-11 12:07:46 +01:00 |
|
TheBusyBiscuit
|
85639c75ac
|
Fixed floor numbers
|
2021-01-11 11:25:03 +01:00 |
|
TheBusyBiscuit
|
32474a588b
|
Added ElevatorFloor class from PR #2699
|
2021-01-11 10:56:46 +01:00 |
|
TheBusyBiscuit
|
a313d8a878
|
Removed comments
|
2021-01-11 10:48:54 +01:00 |
|
TheBusyBiscuit
|
e119f762ac
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
features/inventory-elevator
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/api/events/PlayerPreResearchEvent.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/OpenGuideCommand.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuide.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideImplementation.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideLayout.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/GuideLayoutOption.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/ElevatorPlate.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java
|
2021-01-11 10:47:18 +01:00 |
|
TheBusyBiscuit
|
577ad2c308
|
[CI skip] Prepare RC-19
|
2021-01-11 10:33:12 +01:00 |
|
TheBusyBiscuit
|
4b6610d0b7
|
[CI skip] Finalized guide refactoring
|
2021-01-11 10:30:50 +01:00 |
|
Daniel Walsh
|
d4cfe2a0db
|
Quick fix
|
2021-01-11 07:57:51 +00:00 |
|
Daniel Walsh
|
116642fcec
|
Finish up
|
2021-01-11 07:38:26 +00:00 |
|
TheBusyBiscuit
|
7e48d96fa3
|
Removed "written book" slimefun guide and disabled elevators
|
2021-01-11 02:39:54 +01:00 |
|
TheBusyBiscuit
|
93dc77b188
|
[CI skip] Fixed javadocs
|
2021-01-11 02:14:49 +01:00 |
|
TheBusyBiscuit
|
c280ec26a0
|
Merge branch 'master' into fix/broken-book-guide-and-elevator
|
2021-01-10 23:09:06 +01:00 |
|
TheBusyBiscuit
|
4c879ac3b3
|
Added AndroidFarmEvent (+ refactored Farmer Androids)
|
2021-01-10 21:20:43 +01:00 |
|
TheBusyBiscuit
|
47fc037536
|
[CI skip] Lots of refactoring and documentation
* Moved the ProtectionManager to the IntegrationsManager
* Refactored static NamespacedKeys to be non-static
* Added some documentation
|
2021-01-10 17:32:47 +01:00 |
|