mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 20:25:54 +00:00
Code Releases Activity
4,350 Commits 1 Branch 0 Tags 64 MiB
9d740436a7
Commit Graph

998 Commits

Author SHA1 Message Date
TheBusyBiscuit
9d4d2060ba [CI skip] Added a few more strings to translation files 2020-08-18 14:45:51 +02:00
TheBusyBiscuit
6be0709aea Fixes #2138 2020-08-18 14:18:44 +02:00
TheBusyBiscuit
8e8a87fce6 Fixed ChestTerminal timings showing up as cargo nodes 2020-08-17 17:31:15 +02:00
TheBusyBiscuit
fb47574fe8
Added poma's requested change 
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
 2020-08-17 16:27:26 +02:00
TheBusyBiscuit
a10813036b
Added poma's suggested change 
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
 2020-08-17 13:30:18 +02:00
TheBusyBiscuit
0f73b62658
Added Walshys suggested change 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2020-08-17 13:30:03 +02:00
TheBusyBiscuit
07c62d5932
Added Walshys suggested change 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2020-08-17 13:29:54 +02:00
TheBusyBiscuit
33f6f039ec
Added Walshys suggested change 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2020-08-17 13:29:44 +02:00
TheBusyBiscuit
d4953dd029 [CI skip] Added more Unit Tests 2020-08-17 13:00:22 +02:00
TheBusyBiscuit
1bba2efa3e [CI skip] Added more unit tests 2020-08-17 02:23:28 +02:00
TheBusyBiscuit
7a31c88ce9 Fixes #2207 2020-08-17 00:32:18 +02:00
TheBusyBiscuit
c98fe74ea9
Merge branch 'master' into NitwitRune 2020-08-17 00:25:18 +02:00
dniym
42e4b1620d
Update SlimefunItemSetup.java 
Fixed merge conflict 2
 2020-08-16 13:52:09 -04:00
dniym
45b63a149b
Update HeadTexture.java 
Resolved Merge Conflict 1
 2020-08-16 13:45:18 -04:00
dniym
b22bdb55ff Made requested changes 2020-08-16 13:33:36 -04:00
TheBusyBiscuit
2a8abcbdbf Fixed unit tests, also improved test coverage 2020-08-16 15:57:09 +02:00
TheBusyBiscuit
037e8d83df Small performance improvement, also reduced technical debt a bit 2020-08-16 15:49:47 +02:00
TheBusyBiscuit
eb5b2678e0 Fixes #2077 2020-08-14 01:46:05 +02:00
dniym
644878c534 Made Requested Changes 2020-08-13 16:21:18 -04:00
TheBusyBiscuit
c0d18c5c89 Fixes #2217 2020-08-13 21:13:19 +02:00
dniym
a33cfdb12d added a check for jobless villagers 2020-08-12 16:08:15 -04:00
dniym
a1be08034b made requested changes 2020-08-12 16:04:35 -04:00
dniym
b27059240b Added Rune of Unemployment 
Approved Suggestion: #284 - Vitamin_CE#9804
 2020-08-11 20:58:17 -04:00
TheBusyBiscuit
923b59c6e7 [CI skip] Reduced technical debt 2020-08-11 16:28:52 +02:00
TheBusyBiscuit
e406481b98 [CI skip] Replaced the last tabs with spaces 2020-08-11 16:23:31 +02:00
TheBusyBiscuit
1aaedf0825 [CI skip] Added more Unit Tests 2020-08-11 11:17:08 +02:00
TheBusyBiscuit
485a80f6ef Fixes #2209 2020-08-09 11:41:15 +02:00
TheBusyBiscuit
66f4c48b4b Fixes #2205 2020-08-09 11:33:48 +02:00
TheBusyBiscuit
7de9dd6683 Industrial Miners can now also mine Gilded Blackstone 2020-08-08 12:51:26 +02:00
TheBusyBiscuit
9f49dd3981 Reduced technical debt 2020-08-08 12:47:39 +02:00
TheBusyBiscuit
c08eadcaae Small performance improvement 2020-08-08 00:48:09 +02:00
TheBusyBiscuit
bffbb488ba [CI skip] Added Unit Tests for Piglins 2020-08-08 00:45:01 +02:00
poma123
c2fa590aa1
Requested changes 2020-08-07 22:43:58 +02:00
poma123
6ab196a03d
Requested changes 2020-08-07 22:04:15 +02:00
poma123
87f8e7ae8c
Fixed Industrial Miner debris issue 2020-08-07 21:46:59 +02:00
TheBusyBiscuit
9b21c1ade1
Merge pull request #2202 from dniym/elecPressSand 
Elec press sand
 2020-08-07 19:10:11 +02:00
dniym
1fde84a4c7 Approved Suggestion #272 - AutoBio#8746 2020-08-06 21:08:59 -04:00
TheBusyBiscuit
9de72881ab [CI skip] Fixed some URLs 2020-08-07 00:31:09 +02:00
TheBusyBiscuit
d55a546c42 Fixes #2168 2020-08-06 16:24:41 +02:00
TheBusyBiscuit
46a01c368f
Merge pull request #2192 from poma123/fix/brewing 
Fixed prevent Slimefun items from being added to a Brewing Stand
 2020-08-05 16:49:54 +02:00
TheBusyBiscuit
7c3599c862 [CI skip] Reduced technical debt 2020-08-05 16:44:43 +02:00
TheBusyBiscuit
c168497e79 [CI skip] Reduced technical debt 2020-08-05 13:31:35 +02:00
poma123
9454c890ea Refactoring 2020-08-05 13:02:35 +02:00
poma123
6de4130d05 Fixed prevention when brewing with slimefun items 2020-08-05 12:41:48 +02:00
TheBusyBiscuit
f50d1d2faa Big performance improvements to Enhanced Furnaces when using Paper 2020-08-04 20:15:21 +02:00
TheBusyBiscuit
c56ebe9c23
Merge branch 'master' into IcePick 2020-08-04 19:12:00 +02:00
TheBusyBiscuit
18036aa181
Added a new entry to SlimefunItems.java 2020-08-04 19:07:00 +02:00
TheBusyBiscuit
f8a988261f
Fixed typo 2020-08-04 19:03:20 +02:00
TheBusyBiscuit
3adb634d8b
Make it not override the vanilla item anymore 2020-08-04 19:02:53 +02:00
TheBusyBiscuit
f9e9a7c491
Updated research id to not break compatibility 2020-08-04 19:00:38 +02:00
TheBusyBiscuit
06f64725d9 Improved performance for idling Enhanced Furnaces on Paper 2020-08-04 18:00:31 +02:00
TheBusyBiscuit
35684b60fc Optimized performance for rainbow blocks 2020-08-04 17:59:41 +02:00
TheBusyBiscuit
8faf505999
Mark Korean as done 2020-08-04 12:50:48 +02:00
TheBusyBiscuit
e870f82afd Added piglin bartering to translation files 2020-08-04 12:40:08 +02:00
TheBusyBiscuit
8a9dfe25a8 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-04 12:30:30 +02:00
TheBusyBiscuit
dbed8b55d9
[CI skip] Merge pull request #2136 from dniym/PiglinDropsFgithub 
Piglin drops fgithub
 2020-08-04 12:25:26 +02:00
TheBusyBiscuit
0ff5fc7251 Small performance improvements for miner talismans 2020-08-04 10:19:24 +02:00
TheBusyBiscuit
eecdb61223 Fixed compilation 2020-08-04 09:53:50 +02:00
TheBusyBiscuit
04a71a2408 Merge branch 'cleanup/blockplacing' of https://github.com/TheBusyBiscuit/Slimefun4 into cleanup/blockplacing 2020-08-04 09:52:59 +02:00
TheBusyBiscuit
7cc795f30e One more change 2020-08-04 09:52:53 +02:00
TheBusyBiscuit
54aa45d1d2
Merge branch 'master' into cleanup/blockplacing 2020-08-04 09:47:51 +02:00
TheBusyBiscuit
484c7a22ec Fixes #2180 2020-08-04 09:46:35 +02:00
TheBusyBiscuit
f409b869ae Small performance optimization for bows 2020-08-04 09:46:04 +02:00
TheBusyBiscuit
137e91ad12
Fixes #2181 2020-08-04 01:16:20 +02:00
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
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
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
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
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
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
a472097798 Fixed androids rotating to the wrong side 2020-08-01 16:16:15 +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