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
5,203 Commits 1 Branch 0 Tags 64 MiB
21d6281ecd
Commit Graph

5203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
TheBusyBiscuit
2d00f3e704
Merge branch 'master' into tags 2020-10-08 16:16:11 +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
LinoxGH
09a40d036e
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/EnergyNetComponent.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2020-10-08 16:04:01 +03:00
LinoxGH
40caa2d574
Update ResearchSetup.java 2020-10-08 16:02:53 +03:00
LinoxGH
b5c917f719
Fixed the lore. 2020-10-08 16:00:26 +03:00
LinoxGH
4bf08db1d1
Merge branch 'master' into EnergyConnector 2020-10-08 15:53:08 +03: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
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