mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
5,013 Commits 1 Branch 0 Tags 64 MiB
19de4c8476
Commit Graph

3785 Commits

Author SHA1 Message Date
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
Silent
cf0f7c37e0 Merge remote-tracking branch 'upstream/master' 2020-10-10 18:50:49 +02:00
Silent
0580a873ec Stop unwanted actions with StrangeNetherGoo and HeavyCream 2020-10-10 18:50:41 +02:00
TheBusyBiscuit
44e6449f9e
Merge pull request #2430 from Slimefun/gitlocalize-13351 
Update messages_nl.yml
 2020-10-10 15:27:19 +02:00
TheBusyBiscuit
c9ca11c62c
[CI skip] Merge pull request #2431 from Slimefun/gitlocalize-13352 
Update recipes_nl.yml
 2020-10-10 15:26:19 +02:00
TheBusyBiscuit
ea1d1756ae
[CI skip] Merge pull request #2432 from Slimefun/gitlocalize-13353 
Update categories translation for Dutch
 2020-10-10 15:25:32 +02:00
TheBusyBiscuit
08bb3291c1
[CI skip] Updated translators list 2020-10-10 15:25:03 +02:00
Senne Van Rompaey
47d39cdc3c Translate categories_nl.yml via GitLocalize 2020-10-10 13:12:28 +00:00
milvantiou
025021f5b5 Translate categories_nl.yml via GitLocalize 2020-10-10 13:12:27 +00:00
Sven313D
af608e3c13 Translate recipes_nl.yml via GitLocalize 2020-10-10 12:42:09 +00:00
LinoxGH
973f92c979
Update HeadTexture.java 
I guess this is correct now.
 2020-10-10 15:33:41 +03:00
Senne Van Rompaey
e80b3b64d2 Translate messages_nl.yml via GitLocalize 2020-10-10 12:27:12 +00:00
TheBusyBiscuit
fd123b0bc2 [CI skip] Added another validation to head textures, looks at Linox 2020-10-10 14:22:14 +02:00
LinoxGH
49eca61a27
Changed HeadTexture. 2020-10-10 15:21:44 +03:00
LinoxGH
729facab61
Added Energy Connector texture. 2020-10-10 15:18:55 +03:00
TheBusyBiscuit
f895adde61 [CI skip] Reduced technical debt 2020-10-10 14:17:05 +02:00
TheBusyBiscuit
4c47a9cb93
Merge pull request #2298 from Slimefun/tags 
Implemented Tags
 2020-10-10 13:38:48 +02:00
TheBusyBiscuit
cf6add1149 Some small improvements before the merge 2020-10-10 13:36:07 +02:00
TheBusyBiscuit
c03b54c2c3
[CI skip] Merge pull request #2417 from Slimefun/gitlocalize-13345 
Updated Hungarian translations
 2020-10-10 01:25:10 +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
LinoxGH
26d46c2dc9 Translate researches_tr.yml via GitLocalize 2020-10-09 14:48:14 +00:00
LinoxGH
7e3866a25b Translate messages_tr.yml via GitLocalize 2020-10-09 14:48:12 +00:00
poma123
72f7441a18
Small fixes 2020-10-09 16:36:25 +02:00
poma123
b7b7fa8a34 Translate researches_hu.yml via GitLocalize 2020-10-09 14:30:47 +00:00
poma123
076f1b51a4 Translate resources_hu.yml via GitLocalize 2020-10-09 14:30:45 +00:00
poma123
5ac0792cb0 Translate recipes_hu.yml via GitLocalize 2020-10-09 14:30:43 +00:00
poma123
f3fafaff26 Translate categories_hu.yml via GitLocalize 2020-10-09 14:30:42 +00:00
poma123
bd0f15bc95 Translate messages_hu.yml via GitLocalize 2020-10-09 14:30:38 +00:00
bito-blosh
3e20911c48 Translate researches_ja.yml via GitLocalize 2020-10-09 12:13:19 +00:00
TheBusyBiscuit
c440fd0778 Translate messages_ja.yml via GitLocalize 2020-10-09 12:13:17 +00:00
TheBusyBiscuit
aab665ffea
Merge branch 'master' into tags 2020-10-09 11:46:47 +02:00
LinoxGH
b2833dc5c0
Update MagicalZombiePills.java 2020-10-08 21:42:57 +03:00
TheBusyBiscuit
8c80ad4040 Cleanup 2020-10-08 19:05:23 +02:00
TheBusyBiscuit
d891d182b5 Intentionally messed up imports 2020-10-08 18:53:19 +02:00
TheBusyBiscuit
2d00f3e704
Merge branch 'master' into tags 2020-10-08 16:16:11 +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
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
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
fc26f959b6 [CI skip] Small formatting correction 2020-10-07 18:30:21 +02:00
TheBusyBiscuit
e4ddc7c452 [CI skip] Enforce OTBS. 2020-10-07 18:27:01 +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
LinoxGH
eb572a1a77
Merge branch 'master' into EnergyConnector 2020-10-07 18:10:50 +03: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
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
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
svr333
85091516db Add generic fail message 2020-10-07 12:12:02 +02:00
NCBPFluffyBear
37f0715156 Added permission checks for the GEO Scanner and GPS Control Panel 2020-10-06 19:46:22 -05:00
Seggan
1ccd4c14ac More changes... 2020-10-06 15:41:14 -04:00
Seggan
960d53840a Moved import 2020-10-06 15:39:15 -04:00
Seggan
20aa5d49dc Merged ifs 2020-10-06 15:34:37 -04:00
Seggan
d1ede58f85 More requested changes... 2020-10-06 15:12:35 -04:00
TheBusyBiscuit
47590ac972
Merge branch 'master' into tags 2020-10-06 21:07:49 +02:00
TheBusyBiscuit
d09a7e0f93 Fixes #2391 2020-10-06 21:05:39 +02:00
TheBusyBiscuit
07c84af3b5 Added NotConfigurable attribute 2020-10-06 21:01:18 +02:00
TheBusyBiscuit
f98d048b55 [CI skip] Reduced technical debt 2020-10-06 20:20:02 +02:00
svr333
fa394b4d44 Call planks.isPresent() 2020-10-06 19:50:57 +02:00
svr333
e6ed632dd0 Refactor + undo placeholder item in displayrecipes 2020-10-06 11:53:51 +02:00
svr333
37242fe64a Throw out variables 2020-10-06 01:26:23 +02:00
Seggan
db6295616e Did more requested changes 2020-10-05 17:05:05 -04:00
Seggan
a4dc1428bc Changed protection check (untested) 2020-10-05 17:02:09 -04:00
svr333
8c44c583cf Add nullable tag 2020-10-05 23:01:30 +02:00
svr333
6e17cd2cc5 Extract to method 2020-10-05 23:00:44 +02:00
Seggan
4b3e31a8c7 Renamed listener 2020-10-05 16:56:25 -04:00
svr333
997dce8970 Extract to method && remove redundant if statement 2020-10-05 20:07:56 +02:00
Senne Van Rompaey
94c5068cc2
Move version check 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2020-10-05 20:03:50 +02:00
svr333
038efb8391 Add myself @author 2020-10-05 20:00:31 +02:00
svr333
3ef0a67db6 Add @Nonnull 2020-10-05 19:59:55 +02:00
svr333
9242978a96 Remove redundant if-else && Consume item after output 2020-10-05 19:57:50 +02:00
svr333
ff0c2b7984 Change else if to else 2020-10-05 19:37:12 +02:00
svr333
868a7e566b Change else if to else 2020-10-05 19:34:26 +02:00
svr333
b237d076bf Add version check 2020-10-05 19:34:00 +02:00
svr333
983bc103d3 Refactor 2020-10-05 18:43:11 +02:00
svr333
fe50d96270 Remove empty line 2020-10-05 18:38:58 +02:00
Sfiguz7
1d1adf9b3e Added mc version check 2020-10-05 17:25:57 +02:00
svr333
62aa2dd0d8 Simplify displayrecipes and use planks.isTagged() 2020-10-05 17:23:40 +02:00
Sfiguz7
87dedf3492 Swapped order as it makes more sense + consistency 2020-10-05 17:17:16 +02:00
Sfiguz7
cff403a7b9 Added blackstone and basalt to crucible's recipes 2020-10-05 17:15:53 +02:00
Senne Van Rompaey
8675e96e75
Add space 
Co-authored-by: LinoxGH <54643600+LinoxGH@users.noreply.github.com>
 2020-10-05 17:11:56 +02:00
Seggan
58e2b9ab3b Added default annonation 2020-10-05 11:01:58 -04:00
Seggan
bb24bdd837 Merge remote-tracking branch 'upstream/master' 2020-10-05 10:55:26 -04:00
svr333
0e57d94d61 Add Sticks recipe to Table Saw 2020-10-05 16:28:23 +02:00
svr333
b3ca362df2 Add DisplayRecipes 2020-10-05 16:06:19 +02:00
Seggan
51dd53cae1 Moved elytra cap to magical gadgets 2020-10-05 10:01:38 -04:00
svr333
0a19f76787 Use PigZombie over Entity 2020-10-05 15:56:54 +02:00