mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 20:25:54 +00:00
Code Releases Activity
5,871 Commits 1 Branch 0 Tags 64 MiB
7ffc8aff24
Commit Graph

1756 Commits

Author SHA1 Message Date
TheBusyBiscuit
7ffc8aff24 Fixes #2760 2021-01-26 10:35:47 +01:00
TheBusyBiscuit
9436ce451a Fixes #2460 2021-01-26 10:07:12 +01:00
TheBusyBiscuit
ff83bb025e
[CI skip] Merge pull request #2481 from MoKe12g/master 
Explosive tools not working with silk touch
 2021-01-26 10:02:25 +01:00
TheBusyBiscuit
c2da6c5f53 Changed recipe for Tier 3 electric ore grinder 2021-01-26 00:57:49 +01:00
TheBusyBiscuit
7d0168115f
Merge pull request #2599 from svr333/AddT3ElectricGrinder 
Add Tier 3 Electric Ore Grinder
 2021-01-26 00:56:19 +01:00
TheBusyBiscuit
2085d9eeba [CI skip] Updated changelog 2021-01-26 00:56:03 +01:00
Daniel Walsh
91aaa546a6
Merge pull request #2680 from ProfElements/master 2021-01-25 15:44:06 +00:00
TheBusyBiscuit
36fe08a349
Merge pull request #2765 from StarWishsama/2761 
Fixes #2761 probably
 2021-01-25 16:36:49 +01:00
TheBusyBiscuit
9f29901eb8
[CI skip] Updated translators list 2021-01-25 15:46:35 +01:00
StarWishsama
a6bcab266f chore: remove register call when initialize 2021-01-25 12:18:24 +08:00
TheBusyBiscuit
a9c4df30a4
Update Translators.java 2021-01-24 20:23:30 +01:00
TheBusyBiscuit
4019b9612d
Merge branch 'master' into master 2021-01-24 18:09:40 +01:00
TheBusyBiscuit
0b4c2f2e08 Cherry-picked Talisman of the Wise from #2645 2021-01-24 18:04:52 +01:00
TheBusyBiscuit
f6e9d70baa Merge branch 'feature/experimental-talismans' of https://github.com/Slimefun/Slimefun4.git 2021-01-24 17:03:14 +01:00
TheBusyBiscuit
17fd2ec570 Added AsyncProfileLoadEvent 2021-01-23 19:38:59 +01:00
TheBusyBiscuit
f2a80fc04f
Merge pull request #2749 from Slimefun/patch/make-rechargeablehelper-public 
Make RechargeableHelper public
 2021-01-23 16:11:29 +01:00
TheBusyBiscuit
2ceef773c6 Finished fix for #2754 2021-01-23 15:32:37 +01:00
TheBusyBiscuit
389a2978c0 Fixes #2754 2021-01-23 14:25:10 +01:00
TheBusyBiscuit
83c2c6a915 [CI skip] Refactoring 2021-01-22 22:00:27 +01:00
TheBusyBiscuit
663f5e2063
Update SupportedLanguage.java 2021-01-22 13:02:46 +01:00
TheBusyBiscuit
5a6081ec98
Update Translators.java 2021-01-22 13:02:24 +01:00
TheBusyBiscuit
f36532550b [CI skip] Added a few more unit tests 2021-01-22 12:31:18 +01:00
TheBusyBiscuit
ab8e603ec6
Update ChargeUtils.java 2021-01-21 22:25:53 +01:00
Daniel Walsh
1bc0ae56f1
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-01-21 21:20:14 +00:00
Daniel Walsh
89c0988aca
Make sure capacity is greater than 0 2021-01-21 20:20:52 +00:00
Daniel Walsh
84ca63365c
RechargeableHelper -> ChargeUtils 2021-01-21 20:07:31 +00:00
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
TheBusyBiscuit
35b2c4a1e4
Updated translators list 2021-01-20 14:55:03 +01:00
Daniel Walsh
346fc7bc44
Merge pull request #2733 from Seggan/master 2021-01-20 12:35:07 +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
03b4c10bad [CI skip] Updated changelog 2021-01-16 14:46:00 +01: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