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
4,984 Commits 1 Branch 0 Tags 64 MiB
54ebfbb18c
Commit Graph

108 Commits

Author SHA1 Message Date
uiytt
54ebfbb18c Last formatting fix 2020-11-02 20:06:03 +01:00
uiytt
c56a55dd69 Again Formatting fix 
I will never see the end of these things  ...
 2020-10-23 17:31:27 +02:00
uiytt
f987e6b85d Added unit test for event 
I'm not so sure about this.
I've never writed any tests before
 2020-10-15 17:34:56 +02:00
TheBusyBiscuit
bc6ac0a4d1 [CI skip] Added Tape Measure Unit Tests 2020-10-11 01:27:38 +02:00
TheBusyBiscuit
4a91e99be6 [CI skip] Restructuring test classes 2020-10-11 01:02:39 +02:00
TheBusyBiscuit
bf25fc0b9d [CI skip] Added Unit Tests for new Item Settings 2020-10-10 21:55:54 +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
e4ddc7c452 [CI skip] Enforce OTBS. 2020-10-07 18:27:01 +02:00
TheBusyBiscuit
060170c12d Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
tags

Conflicts:
	src/test/java/io/github/thebusybiscuit/slimefun4/testing/TestUtilities.java
 2020-10-05 10:03:44 +02:00
TheBusyBiscuit
904a9b1ef0 [CI skip] Updated to MockBukit 0.10.0 2020-10-05 10:01:46 +02:00
TheBusyBiscuit
2ac5899abc Whoops 2020-10-04 13:44:04 +02:00
TheBusyBiscuit
b32dc0b727 @poma123 for the rescue 2020-10-04 13:40:41 +02:00
TheBusyBiscuit
655b429f0d Added a new super tag 2020-10-04 13:31:52 +02:00
TheBusyBiscuit
7cab529a2b Merged master into tags 2020-10-04 13:19:54 +02:00
TheBusyBiscuit
078e749679 Added a new Unit test for Slimefun Tags 2020-10-04 13:04:21 +02:00
TheBusyBiscuit
5753def8e9 Hey unit tests, you work now, k pls? 2020-10-04 12:42:59 +02:00
TheBusyBiscuit
c8d2bea162 Maybe now? 👀 2020-10-04 12:16:32 +02:00
TheBusyBiscuit
2ff105dabe Maybe fixed the unit tests? 2020-10-04 11:22:56 +02:00
TheBusyBiscuit
4df4f6d4c9 More Climbing Pick unit tests which may give us better context? 2020-10-04 11:04:35 +02:00
TheBusyBiscuit
50777ac546 A bit of code cleanup and docs 2020-10-04 02:55:11 +02:00
poma123
3ec39ec16a
Merge branch 'master' into tags 2020-10-03 21:46:28 +02:00
poma123
30603d9bf5 Added an EventHandler for Cartography Table 2020-10-01 19:12:09 +02:00
TheBusyBiscuit
a674a38f2a
Merge branch 'master' into tags 2020-09-28 15:07:29 +02:00
TheBusyBiscuit
a439722062 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-09-22 18:37:41 +02:00
TheBusyBiscuit
14b96aae5b
Added back dirt_like tag 2020-09-22 15:51:08 +02:00
TheBusyBiscuit
428c8b4774
Added back tall_flowers tag 2020-09-22 15:46:06 +02:00
TheBusyBiscuit
4c530a4813
Merge branch 'master' into tags 2020-09-22 15:37:03 +02:00
TheBusyBiscuit
d35ee992ae [CI skip] Added another Unit Test 2020-09-21 23:54:21 +02:00
Panda.com
1c0abdd3fe Did i really get out of bed for this 2020-09-21 23:22:13 +02:00
Panda.com
f63d246b82 changed doors to wooden_doors 2020-09-21 22:26:54 +02:00
Panda.com
59f422c757 note to self listen to your notes 2020-09-21 22:16:32 +02:00
Panda.com
b7def0f58d Added materials to CoalGenerator 2020-09-21 22:14:22 +02:00
TheBusyBiscuit
9547d51db2 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
tags

Conflicts:
	CHANGELOG.md
	src/test/java/io/github/thebusybiscuit/slimefun4/testing/TestUtilities.java
 2020-09-19 11:35:41 +02:00
Daniel Walsh
07f5687b9f
Merge pull request #2323 from LinoxGH/patch-3 2020-09-13 22:33:13 +01:00
LinoxGH
efe65bcd20
Fixed unit tests. 2020-09-14 00:11:34 +03:00
TheBusyBiscuit
a770378025 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-13 11:57:11 +02:00
poma123
be5f793695 Fixed a bunch of typos 2020-09-11 20:02:17 +02:00
TheBusyBiscuit
ff9a6f7a3e Fixed Unit Tests 2020-09-11 10:44:00 +02:00
TheBusyBiscuit
ed66ee9b79 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
tags

Conflicts:
	CHANGELOG.md
 2020-09-11 10:33:02 +02:00
NCBPFluffyBear
37c0ce4ce0 Organized imports 2020-09-10 23:52:19 -05:00
TheBusyBiscuit
74edbe499c Fixes #2238 2020-09-11 00:07:26 +02:00
NCBPFluffyBear
128bc65417 Did requested changes 2020-09-10 16:36:52 -05:00
NCBPFluffyBear
57f52f62c6 Did requested changes 2020-09-10 16:27:50 -05:00
NCBPFluffyBear
6b95ed0293 Added Charge Command 2020-09-10 16:02:03 -05:00
TheBusyBiscuit
19c67a2266 Unit Test should no longer fail 2020-09-09 15:52:59 +02:00
TheBusyBiscuit
7fdf10cc8b Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
tags

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java
 2020-09-08 12:37:25 +02:00
Daniel Walsh
53dea5e195 Some good old micro-optimisations 2020-09-07 22:38:23 +01:00
TheBusyBiscuit
81a8732f41 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-07 13:06:50 +02:00
TheBusyBiscuit
7c8b8e0c59 Discord webhook, please work 2020-09-07 13:02:59 +02:00