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
4,878 Commits 1 Branch 0 Tags 64 MiB
125239f173
Commit Graph

4878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
svr333
125239f173 Refactor and rename methods 2020-10-12 00:19:19 +02:00
svr333
bbf5236bd6 Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans 2020-10-09 16:49:24 +02:00
svr333
64684d86c3 Reduce to local scoop 2020-10-09 16:49:06 +02:00
TheBusyBiscuit
3bb974ce96
Delete imports-fix.yml 2020-10-08 23:25:07 +02:00
svr333
b042fbd3a4 Add check for ProtectionManagers 2020-10-08 22:34:18 +02:00
svr333
9dcf895258 Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans 2020-10-08 22:15:53 +02:00
svr333
1cfc8aec90 Refactor (no build errors) 2020-10-08 22:15:30 +02:00
TheBusyBiscuit
b399d0c942
Or maybe the ticks go here... 2020-10-08 18:30:35 +02:00
TheBusyBiscuit
3bcc00b62f
Perhaps we just need ticks 2020-10-08 18:29:59 +02:00
TheBusyBiscuit
cfc55038ea
Maybe this? 2020-10-08 18:29:24 +02:00
TheBusyBiscuit
488f1c626b
Update imports-fix.yml 2020-10-08 18:26:45 +02:00
TheBusyBiscuit
cdac03e411
Update imports-fix.yml 2020-10-08 18:25:57 +02:00
svr333
dc21ec5752 Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans 2020-10-08 18:23:15 +02:00
svr333
172dfc0610 Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into MoreTalismans 2020-10-08 18:22:23 +02:00
svr333
7c030c736f Refactor (still build errors) 2020-10-08 18:21:00 +02:00
TheBusyBiscuit
ddd8ccec6b
Imports go brrrrrr 2020-10-08 18:12:34 +02:00
TheBusyBiscuit
20405a775b
[CI skip] Added Imports cleanup action 2020-10-08 18:11:16 +02:00
svr333
82716dd808 Fix resurrected_talisman lore 2020-10-08 15:30:25 +02:00
svr333
73cbbc3b54 Improve recipes of new Talismans 2020-10-08 15:29:46 +02:00
TheBusyBiscuit
26066f2e6c Refactoring 2020-10-08 14:45:21 +02:00
TheBusyBiscuit
01d233af4d
Merge pull request #2402 from NCBPFluffyBear/gps-permission-fix 
GPS Control Panel and GEO Scanner access checks
 2020-10-08 14:37:16 +02:00
TheBusyBiscuit
359cba3c13
[CI skip] Updated changelog 2020-10-08 14:36:58 +02:00
TheBusyBiscuit
793ec142d2
[CI skip] Merge pull request #2407 from Slimefun/code-style 
Added some code-style guidelines to CONTRIBUTING
 2020-10-08 14:35:47 +02:00
TheBusyBiscuit
f3e1502203
Added a disclaimer 2020-10-08 11:39:51 +02:00
TheBusyBiscuit
033bd3b469
Update CONTRIBUTING.md 2020-10-08 11:18:22 +02:00
TheBusyBiscuit
fb8ff55504
Added missing bracket 2020-10-08 10:43:14 +02:00
TheBusyBiscuit
f2db686aba
Added info about guard blocks 2020-10-08 00:47:19 +02:00
NCBPFluffyBear
90ccbb2261 Organized imports 2020-10-07 17:37:41 -05:00
svr333
b722dc2a00 Update lore 2020-10-08 00:20:35 +02:00
NCBPFluffyBear
b577c1e4a3 Did changes 2020-10-07 13:45:49 -05:00
TheBusyBiscuit
4936c25e49
Horizontal whitespaces 2020-10-07 18:53:13 +02:00
TheBusyBiscuit
95084eff70
Added empty lines 2020-10-07 18:32:36 +02:00
TheBusyBiscuit
fc26f959b6 [CI skip] Small formatting correction 2020-10-07 18:30:21 +02:00
TheBusyBiscuit
ddf9016b05
StringBuilder 2020-10-07 18:28:04 +02:00
TheBusyBiscuit
e4ddc7c452 [CI skip] Enforce OTBS. 2020-10-07 18:27:01 +02:00
TheBusyBiscuit
fa2c1d9957
Updated code style guidelines 2020-10-07 18:25:33 +02:00
TheBusyBiscuit
ed8f0e243b Fixes #2405 2020-10-07 17:48:53 +02:00
TheBusyBiscuit
9436f2ec47
Update CONTRIBUTING.md 2020-10-07 17:32:14 +02:00
TheBusyBiscuit
816c0a4e49
Updated headings 2020-10-07 17:23:44 +02:00
TheBusyBiscuit
bbb2a78a4c
Added some code-style guidelines to CONTRIBUTING 2020-10-07 17:16:33 +02:00
svr333
d17d21b7ed Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans 2020-10-07 17:04:31 +02:00
svr333
a6a29509c7 Fix remaining issues 2020-10-07 17:02:42 +02:00
TheBusyBiscuit
273d95ed9c
Delete settings.json 2020-10-07 16:51:52 +02:00
svr333
5e39920e59 Remove static's 2020-10-07 16:45:34 +02:00
svr333
9be590459a Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans 2020-10-07 16:43:20 +02:00
svr333
79d652bb70 Add .factorypath and .vscode folder 2020-10-07 16:42:53 +02:00
TheBusyBiscuit
78515a3c61
Merge pull request #2396 from svr333/AddSticksRecipeToTableSaw 
Add sticks recipe to table saw
 2020-10-07 16:31:58 +02:00
TheBusyBiscuit
354cb201c5
[CI skip] Updated changelog 2020-10-07 16:31:33 +02:00
TheBusyBiscuit
20a9c642fe Some code cleanup 2020-10-07 16:24:14 +02:00
Senne Van Rompaey
085ad2cd6b
Merge branch 'master' into MoreTalismans 2020-10-07 16:06:32 +02:00