mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 12:15:50 +00:00
Code Releases Activity
7c3fc99b3a
Slimefun4/src/main/java/io/github/thebusybiscuit/slimefun4
History
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
..
api Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 2020-10-07 18:38:26 +02:00
core Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 2020-10-07 18:38:26 +02:00
implementation Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 2020-10-07 18:38:26 +02:00
utils Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 2020-10-07 18:38:26 +02:00