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
4,131 Commits 1 Branch 0 Tags 64 MiB
344596b10f
Commit Graph

4131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheBusyBiscuit
8f289dcdbe Fixes #2181 2020-08-04 01:15:14 +02:00
TheBusyBiscuit
56b78eac61 Fixes #2183 2020-08-04 00:58:43 +02:00
TheBusyBiscuit
cafa66b1a8 Fixes #2184 2020-08-04 00:48:23 +02:00
TheBusyBiscuit
012a0a7df9 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into cleanup/blockplacing

Conflicts:
	CHANGELOG.md
 2020-08-03 17:28:17 +02:00
TheBusyBiscuit
d8f5992282 Fixes #2103 2020-08-03 17:25:27 +02:00
TheBusyBiscuit
8d1e427409 A few more changes 2020-08-03 00:30:58 +02:00
dniym
17f84bcffd
Update PiglinBarterDrop.java 
done
 2020-08-02 17:44:57 -04:00
dniym
ecb3a354ff
Update PiglinBarterDrop.java 
fixed
 2020-08-02 17:44:11 -04:00
dniym
9287e1098d
Update PiglinListener.java 
fixed
 2020-08-02 17:43:26 -04:00
TheBusyBiscuit
1aeba31a96 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into cleanup/blockplacing

Conflicts:
	CHANGELOG.md
 2020-08-02 23:15:05 +02:00
TheBusyBiscuit
6dd2129dfe
[CI skip] Updated changelog 2020-08-02 23:13:23 +02:00
dniym
21305ddfdb
Update PiglinListener.java 
fixed a compile error
 2020-08-02 16:37:19 -04:00
dniym
9edc082230
Update PiglinBarterDrop.java 2020-08-02 16:29:08 -04:00
dniym
c2376b90b3
Update PiglinListener.java 
made requested changes.
 2020-08-02 16:25:39 -04:00
TheBusyBiscuit
503286c750
Merge pull request #2173 from lleyton/master 
Allow Ancient Debris to be mined by Industrial Miners
 2020-08-02 22:16:13 +02:00
Lleyton Gray
43838d7270
Applying suggestion 
Signed-off-by: Lleyton Gray <lleyton@innatical.com>
 2020-08-02 13:07:55 -07:00
TheBusyBiscuit
1389085932 Fixed Reinforced Spawners 2020-08-02 22:01:32 +02:00
Lleyton Gray
3703aaa993
Add ItemSetting for toggling mining of Ancient Debris. 
Signed-off-by: Lleyton Gray <lleyton@innatical.com>
 2020-08-02 12:52:16 -07:00
TheBusyBiscuit
d20650855c Fixes #2179 2020-08-02 21:45:58 +02:00
TheBusyBiscuit
b26f2a1ca8 Merge branch 'cleanup/blockplacing' of https://github.com/TheBusyBiscuit/Slimefun4 into cleanup/blockplacing 2020-08-02 21:37:03 +02:00
TheBusyBiscuit
a0b9579514 Added ToolUseHandler 2020-08-02 21:36:49 +02:00
lleyton
4c2b6bd1e7
Merge pull request #1 from TheBusyBiscuit/master 
Sync Upstream with Fork
 2020-08-02 12:18:47 -07:00
TheBusyBiscuit
39719adc0e
[CI skip] Merge pull request #2178 from TheBusyBiscuit/renovate/com.konghq-unirest-java-3.x 
Update dependency com.konghq:unirest-java to v3.9.00
 2020-08-02 20:13:45 +02:00
Renovate Bot
3580876ec5
Update dependency com.konghq:unirest-java to v3.9.00 2020-08-02 18:08:23 +00:00
dniym
eed7b873c7
Update PiglinBarterDrop.java 
made requested changes
 2020-08-02 11:46:46 -04:00
dniym
8305729cfb
Update RandomMobDrop.java 
made requested changes.
 2020-08-02 11:45:19 -04:00
TheBusyBiscuit
6608c3c5d7
Merge branch 'master' into cleanup/blockplacing 2020-08-02 17:43:08 +02:00
TheBusyBiscuit
f32280a4ce Fixes #2176 2020-08-02 17:39:09 +02:00
TheBusyBiscuit
2316650256
[CI skip] Merge pull request #2175 from TheBusyBiscuit/gitlocalize-12496 
Updated korean research translations
 2020-08-02 17:38:45 +02:00
TheBusyBiscuit
9c44a4cece
[CI skip] Merge pull request #2177 from TheBusyBiscuit/renovate/com.konghq-unirest-java-3.x 
Update dependency com.konghq:unirest-java to v3.8.07
 2020-08-02 17:35:16 +02:00
Renovate Bot
9b6cb20e02
Update dependency com.konghq:unirest-java to v3.8.07 2020-08-02 15:27:07 +00:00
TheBusyBiscuit
6573a60016 Another commit full of cleanup stuff 2020-08-02 15:16:21 +02:00
TheBusyBiscuit
23d730cd7a Some more refactoring 2020-08-02 14:04:24 +02:00
TheBusyBiscuit
bf65b310aa Fixes #2147 2020-08-02 13:55:58 +02:00
TheBusyBiscuit
34b82d7a6f Fixes #2164 2020-08-02 13:55:31 +02:00
20181241
650f81e70a Translate researches_ko.yml via GitLocalize 2020-08-02 11:46:08 +00:00
kudansul
f3191658b8 Translate researches_ko.yml via GitLocalize 2020-08-02 11:46:07 +00:00
TheBusyBiscuit
e52d062ef5 Reduced technical debt and clutter 2020-08-02 11:22:00 +02:00
Lleyton Gray
fadb31feb1
Allow Ancient Debris to be mined by Industrial Miners 2020-08-01 20:47:43 -07:00
TheBusyBiscuit
0f924e485b
[CI skip] Merge pull request #2159 from TheBusyBiscuit/gitlocalize-12482 
Categories_it
 2020-08-01 16:58:41 +02:00
TheBusyBiscuit
c8c3edb66c
[CI skip] Merge pull request #2157 from TheBusyBiscuit/gitlocalize-12480 
Researches_it
 2020-08-01 16:58:26 +02:00
TheBusyBiscuit
6fb2f3b09a
Merge pull request #2167 from TheBusyBiscuit/renovate/com.github.thebusybiscuit-cs-corelib2-0.x 
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.25
 2020-08-01 16:58:10 +02:00
Renovate Bot
b9e857f9b0
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.25 2020-08-01 14:29:33 +00:00
TheBusyBiscuit
a472097798 Fixed androids rotating to the wrong side 2020-08-01 16:16:15 +02:00
TheBusyBiscuit
72a3f59d4b Removed a deprecated method 2020-08-01 15:56:14 +02:00
TheBusyBiscuit
6580e82606 Removed deprecated things 2020-08-01 12:31:05 +02:00
TheBusyBiscuit
c510a8708c Performance improvements for androids 2020-08-01 12:25:47 +02:00
TheBusyBiscuit
76362b2acb Fixes #2166 2020-08-01 00:17:43 +02:00
TheBusyBiscuit
2fc18aed0a Fixes #2162 2020-07-31 20:24:58 +02:00
TheBusyBiscuit
e380f8b972 Fixes #2165 2020-07-31 20:18:51 +02:00