mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 12:15:50 +00:00
Code Releases Activity
5,193 Commits 1 Branch 0 Tags 64 MiB
3170f143a2
Commit Graph

249 Commits

Author SHA1 Message Date
TheBusyBiscuit
3170f143a2 Added a config option to disable network visualizations 2020-11-04 11:18:06 +01:00
TheBusyBiscuit
e7f7a4d392
Merge pull request #2462 from uiytt/canUnlockResearchEvent 
Added PlayerPreResearchEvent
 2020-11-03 09:41:42 +01:00
uiytt
54ebfbb18c Last formatting fix 2020-11-02 20:06:03 +01:00
uiytt
f6a3366aac imports order 2020-10-23 17:36:58 +02:00
uiytt
c56a55dd69 Again Formatting fix 
I will never see the end of these things  ...
 2020-10-23 17:31:27 +02:00
uiytt
95a2dc08d4 Formatting fix 2020-10-22 16:06:11 +02:00
TheBusyBiscuit
4aff61f3b1 Removed 1.13 support 2020-10-17 12:54:36 +02:00
uiytt
08b32ce89f Typo fix 2020-10-14 17:39:16 +02:00
uiytt
cd8603a6d8 Formatting fix 2020-10-12 22:12:37 +02:00
uiytt
9ded6d1ac4 Added PreCanUnlockResearchEvent 
This event is called when a player click to unlock a research
 2020-10-12 19:19:31 +02:00
TheBusyBiscuit
160c68b378 [CI skip] Refactoring and documentation 2020-10-12 15:04:27 +02:00
TheBusyBiscuit
b4b18f548f [CI skip] Reduced technical debt 2020-10-11 12:48:51 +02:00
TheBusyBiscuit
bf25fc0b9d [CI skip] Added Unit Tests for new Item Settings 2020-10-10 21:55:54 +02:00
TheBusyBiscuit
594d322df2 [CI skip] Added EnumSetting 2020-10-10 21:20:25 +02:00
TheBusyBiscuit
a44f2fa626 [CI skip] Some cleanup 2020-10-10 20:46:17 +02:00
TheBusyBiscuit
2da7efd380
[CI skip] Updated a javadocs tag 2020-10-10 19:18:15 +02:00
TheBusyBiscuit
b60c2382a5
[CI skip] Quickly added DoubleRangeSetting copy 2020-10-10 18:52:22 +02:00
TheBusyBiscuit
f895adde61 [CI skip] Reduced technical debt 2020-10-10 14:17:05 +02:00
TheBusyBiscuit
72d3d24394 Two annotations! 2020-10-09 17:44:15 +02:00
TheBusyBiscuit
83e8010e29 Lots of refactoring 2020-10-09 17:39:21 +02:00
TheBusyBiscuit
7c3fc99b3a Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
tags

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSetting.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveTool.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java
	src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/implementations/tools/TestClimbingPick.java
 2020-10-07 18:38:26 +02:00
TheBusyBiscuit
e4ddc7c452 [CI skip] Enforce OTBS. 2020-10-07 18:27:01 +02:00
TheBusyBiscuit
b32dc0b727 @poma123 for the rescue 2020-10-04 13:40:41 +02:00
TheBusyBiscuit
76e42fa9af Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-10-04 13:17:13 +02:00
TheBusyBiscuit
5753def8e9 Hey unit tests, you work now, k pls? 2020-10-04 12:42:59 +02:00
b10n1k
91a5b56947 Define a constant instead of duplicating "backpacks." 2020-10-04 12:09:04 +02:00
TheBusyBiscuit
ceadd2147f Added a debug line to finally fix this unit test 2020-10-04 11:51:03 +02:00
TheBusyBiscuit
0e6fc92e28
Merge branch 'master' into tags 2020-10-04 00:46:37 +02:00
LinoxGH
dbe8755e4a
Update src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunGuideOpenEvent.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2020-10-04 01:04:41 +03:00
LinoxGH
2ed707b3b3
Update SlimefunGuideOpenEvent.java 2020-10-04 00:25:27 +03:00
LinoxGH
f7c3a5b052
Did some more requestes changes. 2020-10-04 00:09:52 +03:00
LinoxGH
41fc987083
Did more requested changes. 2020-10-03 23:56:51 +03:00
LinoxGH
869051b093
Merge branch 'master' into SfGuideEvent 2020-10-03 23:09:25 +03:00
LinoxGH
d72a60aed1
Added GuideOpenEvent. 2020-10-03 23:04:39 +03:00
TheBusyBiscuit
a674a38f2a
Merge branch 'master' into tags 2020-09-28 15:07:29 +02:00
TheBusyBiscuit
c0190bfa2d
Merge pull request #2334 from poma123/develop/generator-events 
Added AsyncReactorProcessCompleteEvent and AsyncGeneratorProcessCompleteEvent
 2020-09-23 17:17:25 +02:00
TheBusyBiscuit
99e46fcb2a [CI skip] Relocated and documented two methods 2020-09-22 19:39:06 +02:00
TheBusyBiscuit
2f37c2b8b7
Merge branch 'master' into tags 2020-09-21 13:24:44 +02:00
TheBusyBiscuit
0227e0cc30 [CI skip] Reduced technical debt 2020-09-21 12:51:13 +02:00
poma123
8592051f87 Requested changes 2020-09-19 18:58:38 +02:00
poma123
24a97c59d8 Refactoring 2020-09-19 10:37:33 +02:00
poma123
b98cdcf7d8 Added AsyncReactorProcessCompleteEvent 2020-09-19 10:37:06 +02:00
poma123
fa1aad7bf8 Added AsyncGeneratorProcessCompleteEvent 2020-09-19 10:36:27 +02:00
TheBusyBiscuit
a770378025 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-13 11:57:11 +02:00
TheBusyBiscuit
7b10410a70 [Ci skip] A small change 2020-09-13 11:38:04 +02:00
poma123
be5f793695 Fixed a bunch of typos 2020-09-11 20:02:17 +02:00
TheBusyBiscuit
6fd90bde4f Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-10 16:19:23 +02:00
poma123
d22f7f31d8 Renamed to AsyncMachineProcessCompleteEvent 2020-09-10 14:36:41 +02:00
poma123
6e4ad1345f
This has to be async 2020-09-10 13:58:58 +02:00
poma123
8f34365aaa Removed redundant annotations 2020-09-09 14:51:21 +02:00