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,611 Commits 1 Branch 0 Tags 64 MiB
8365d1e6d9
Commit Graph

4611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Gomez Andoy
a0fe200948 Translate messages_tl.yml via GitLocalize 2020-08-05 14:54:16 +00:00
TheBusyBiscuit
3d8e01e6f2 Translate messages_de.yml via GitLocalize 2020-08-05 14:52:33 +00: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
32849ca563
Merge branch 'master' into refactoring/block-energy 2020-08-05 16:45:34 +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
dniym
5815669b04
Merge pull request #15 from TheBusyBiscuit/master 
asdf
 2020-08-04 17:16:14 -04: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
77d10e4015
[CI skip] Merge pull request #2182 from TheBusyBiscuit/renovate/me.clip-placeholderapi-2.x 
Update dependency me.clip:placeholderapi to v2.10.9
 2020-08-04 18:35:51 +02:00
Renovate Bot
cf82201dca
Update dependency me.clip:placeholderapi to v2.10.9 2020-08-04 16:31:44 +00:00
TheBusyBiscuit
06f64725d9 Improved performance for idling Enhanced Furnaces on Paper 2020-08-04 18:00:31 +02:00
TheBusyBiscuit
9719058bbc Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-04 17:59:55 +02:00
TheBusyBiscuit
35684b60fc Optimized performance for rainbow blocks 2020-08-04 17:59:41 +02:00
TheBusyBiscuit
95b7d5b11f
[CI skip] Merge pull request #2190 from TheBusyBiscuit/gitlocalize-12527 
Tagalog/Filipino Translation Update
 2020-08-04 16:00:27 +02:00
TheBusyBiscuit
d80fdac23b Fixed debug fish 2020-08-04 15:49:58 +02:00
TheBusyBiscuit
b6ba6ce754 Updated all electric machines 2020-08-04 15:43:00 +02:00
Scott Gomez Andoy
927eefd63c Translate recipes_tl.yml via GitLocalize 2020-08-04 12:46:42 +00:00
TheBusyBiscuit
bc387ee47a Updated EnergyNet code 2020-08-04 13:50:22 +02:00
TheBusyBiscuit
368d2f5798 Move block energy code to EnergyNetComponent 2020-08-04 13:29:45 +02:00
TheBusyBiscuit
736b48a799
Merge pull request #2188 from TheBusyBiscuit/gitlocalize-12525 
Added korean as a language
 2020-08-04 12:54:45 +02:00
TheBusyBiscuit
14f0b0f3fe
[CI skip] Merge pull request #2186 from TheBusyBiscuit/gitlocalize-12523 
Updated german translation
 2020-08-04 12:54:20 +02:00
TheBusyBiscuit
bed8713b3f
[CI skip] Merge pull request #2187 from TheBusyBiscuit/gitlocalize-12524 
Updated TR localization
 2020-08-04 12:53:58 +02:00
TheBusyBiscuit
8faf505999
Mark Korean as done 2020-08-04 12:50:48 +02:00
TheBusyBiscuit
a8bb156ac3
Update CHANGELOG.md 2020-08-04 12:49:41 +02:00
kudansul
e40e5f74b8 Translate messages_ko.yml via GitLocalize 2020-08-04 10:48:40 +00:00
kwonms871
b41ef97859 Translate messages_ko.yml via GitLocalize 2020-08-04 10:48:38 +00:00
LinoxGH
bdde1d9745 Translate recipes_tr.yml via GitLocalize 2020-08-04 10:45:39 +00:00
MeerBiene
7a3d7b8908 Translate recipes_de.yml via GitLocalize 2020-08-04 10:44:16 +00:00
TheBusyBiscuit
c2443a4df2 Translate recipes_de.yml via GitLocalize 2020-08-04 10:44:15 +00: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
7b1e90c7b2
Merge pull request #2174 from TheBusyBiscuit/cleanup/blockplacing 
Added BlockPlacerPlaceEvent, deprecated SlimefunBlockHandler#onPlace() and improved BlockPlaceHandler
 2020-08-04 10:06:44 +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