mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity
4,896 Commits 1 Branch 0 Tags 64 MiB
83e8010e29
Commit Graph

4896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheBusyBiscuit
83e8010e29 Lots of refactoring 2020-10-09 17:39:21 +02:00
TheBusyBiscuit
aab665ffea
Merge branch 'master' into tags 2020-10-09 11:46:47 +02:00
TheBusyBiscuit
de5db265d5
Merge pull request #2413 from LinoxGH/ZombiePillFix fixes #2412 
Zombie pill fix
 2020-10-08 21:20:50 +02:00
TheBusyBiscuit
a82eb7405a
[CI skip] Updated changelog 2020-10-08 21:20:38 +02:00
LinoxGH
b2833dc5c0
Update MagicalZombiePills.java 2020-10-08 21:42:57 +03:00
LinoxGH
0313973653
Merge pull request #8 from Slimefun/master 
Update
 2020-10-08 21:40:47 +03:00
TheBusyBiscuit
8c80ad4040 Cleanup 2020-10-08 19:05:23 +02:00
TheBusyBiscuit
b05977c39b
[CI skip] Removed imports workflow 2020-10-08 19:04:23 +02:00
TheBusyBiscuit
5aa6a8b7b1 Removed github token from imports workflow 2020-10-08 19:01:28 +02:00
TheBusyBiscuit
d891d182b5 Intentionally messed up imports 2020-10-08 18:53:19 +02:00
TheBusyBiscuit
b6624bd43a Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-10-08 18:52:21 +02:00
TheBusyBiscuit
6f4802f7b6
[CI skip] Fixed imports workflow 2020-10-08 18:33:01 +02:00
TheBusyBiscuit
20405a775b
[CI skip] Added Imports cleanup action 2020-10-08 18:11:16 +02:00
TheBusyBiscuit
2d00f3e704
Merge branch 'master' into tags 2020-10-08 16:16:11 +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
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
126ccf3d01 Formatting 2020-10-07 18:43:55 +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
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
poma123
cd00848795
Merge branch 'master' into tags 2020-10-07 17:55:26 +02:00
TheBusyBiscuit
ed8f0e243b Fixes #2405 2020-10-07 17:48:53 +02:00
TheBusyBiscuit
c3302d8cbd
Merge branch 'master' into tags 2020-10-07 17:44:27 +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
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
poma123
7814bdcdee
Merge branch 'master' into tags 2020-10-07 16:11:41 +02:00
TheBusyBiscuit
80c4242dd7
Merge pull request #2384 from Seggan/master 
Added Elytra Cap
 2020-10-07 16:01:45 +02:00
TheBusyBiscuit
7b179239e4
[CI skip] Updated changelog 2020-10-07 16:01:19 +02:00
TheBusyBiscuit
942cb8e1e1
Merge pull request #2404 from Sfiguz7/master 
Fixes #2403
 2020-10-07 14:30:10 +02:00
TheBusyBiscuit
c33f73d2fe
[CI skip] Updated changelog 2020-10-07 14:30:01 +02:00
Sfiguz7
91a7d9eacd Why u do dis IntelliJ >:( 2020-10-07 13:37:32 +02:00
Sfiguz7
46dca73e04 Forgot to clean crucible changes off 2020-10-07 13:36:11 +02:00
Sfiguz7
f8be447821 Fixes #2403 2020-10-07 13:32:10 +02:00
Sfiguz7
51d0ac0417 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-10-07 13:06:45 +02:00