mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 04:05:48 +00:00
Code Releases Activity
5,140 Commits 1 Branch 0 Tags 64 MiB
f197e26a9c
Commit Graph

1752 Commits

Author SHA1 Message Date
TheBusyBiscuit
9e3ce9faf1 [CI skip] Formatting 2020-10-12 16:39:06 +02:00
Sfiguz7
2a8c0f7f82 Moved imports. 2020-10-12 16:25:22 +02:00
TheBusyBiscuit
9b1d6367b3 Some lore changes 2020-10-12 16:01:27 +02:00
TheBusyBiscuit
87d319cd02
Merge pull request #2382 from LinoxGH/EnergyConnector 
Energy Connectors
 2020-10-12 15:49:50 +02:00
TheBusyBiscuit
2e83b726bc [CI skip] Removed author tags from high-cohesion classes 2020-10-12 15:49:33 +02:00
TheBusyBiscuit
160c68b378 [CI skip] Refactoring and documentation 2020-10-12 15:04:27 +02:00
Sfiguz7
6cab415e37 Formatting, nerfed Basalt -> Lava 2020-10-12 14:10:16 +02:00
TheBusyBiscuit
612aad5d95 Fixes #2424 2020-10-12 12:11:28 +02:00
TheBusyBiscuit
3b7dd68164 Fixes #2450 2020-10-12 11:52:23 +02:00
TheBusyBiscuit
14e18d2962 Fixes #2455 2020-10-12 11:47:13 +02:00
Sfiguz7
fd58155a18 Added blackstone and basalt -> lava to crucibles 2020-10-12 09:10:52 +02:00
TheBusyBiscuit
f1dea4cab9
Merge pull request #2451 from CURVX/master 
Fix #2433
 2020-10-11 18:09:23 +02:00
CURVX
a9e64dbcfc Resolves #2433 2020-10-11 19:58:17 +05:30
CURVX
064453346d Resolves #2433 2020-10-11 19:49:34 +05:30
TheBusyBiscuit
c099f0bed4 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-10-11 15:41:47 +02:00
TheBusyBiscuit
df4a87d9fa [Ci skip] A little bit of refactoring 2020-10-11 15:41:42 +02:00
LinoxGH
8eeb582ea3
Changed connector recipe. 2020-10-11 15:36:07 +03:00
TheBusyBiscuit
15884c65aa
Merge pull request #2435 from TheSilentPro/master fixes #2420 fixes #2422 
Stop unwanted actions from StrangeNetherGoo and Heavy Cream
 2020-10-11 13:46:40 +02:00
TheBusyBiscuit
b4b18f548f [CI skip] Reduced technical debt 2020-10-11 12:48:51 +02:00
Silent
7177946aae Changes pt2 2020-10-11 12:44:15 +02:00
TheBusyBiscuit
b80bc87ddc
Merge pull request #2440 from LinoxGH/ExplosivePickFix Fixed #2439 2020-10-11 12:27:27 +02:00
Silent
2902f74d10 Changes 2020-10-11 12:14:58 +02:00
LinoxGH
4980b078a1
Update BlockListener.java 2020-10-11 08:50:04 +03:00
LinoxGH
7af1e8144d
Update ExplosiveTool.java 2020-10-11 08:48:27 +03:00
TheBusyBiscuit
bc6ac0a4d1 [CI skip] Added Tape Measure Unit Tests 2020-10-11 01:27:38 +02:00
LinoxGH
957bcd9a3a
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2020-10-11 02:01:54 +03:00
LinoxGH
d3c0a110a9
Changed capacitor recipe. 2020-10-11 00:31:06 +03:00
LinoxGH
ad505b6cef
Merge branch 'master' into EnergyConnector 2020-10-11 00:26:43 +03:00
LinoxGH
6082abb9b6
Merge branch 'master' into ExplosivePickFix 2020-10-11 00:23:59 +03:00
LinoxGH
bf3e6754cc
Changed event priorities. 2020-10-11 00:19:15 +03:00
LinoxGH
05d7ab5643
Update ExplosiveTool.java 2020-10-11 00:12:42 +03:00
Silent
dfe33b3534 Didn't know this existed 2020-10-10 22:05:50 +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
Silent
f9928e5e10 Add requested changes 2020-10-10 20:20:08 +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
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
08bb3291c1
[CI skip] Updated translators list 2020-10-10 15:25:03 +02:00
LinoxGH
973f92c979
Update HeadTexture.java 
I guess this is correct now.
 2020-10-10 15:33:41 +03: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
cf6add1149 Some small improvements before the merge 2020-10-10 13:36:07 +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
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