balazsszalab
/
MineClone5
forked from MineClone5/MineClone5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

master #1

Merged
balazsszalab merged 73 commits from MineClone5/MineClone5:master into master 2022-06-18 17:29:28 +02:00
Conversation 0 Commits 73 Files Changed 114 +3134 -1478

73 Commits

Author SHA1 Message Date
PrairieWind d33aba9355 Merge pull request 'fixed-elytra' (#343) from FlamingRCCars/MineClone5-FlamingRCCars:fixed-elytra into master 
Reviewed-on: MineClone5/MineClone5#343
 2022-06-17 21:42:16 +00:00
FlamingRCCars 88935cbcbd Update 'mods/ITEMS/mcl_armor/register.lua' 2022-06-17 21:27:46 +00:00
FlamingRCCars 73d67792ee Merge branch 'master' into fixed-elytra 2022-06-17 21:08:08 +00:00
FlamingRCCars 5ceed2672e fixed-elytras 2022-06-17 16:04:30 -05:00
FlamingRCCars 5d2552eb97 Fixed elytra not working when enchanted 2022-06-17 13:36:19 -05:00
unknown 047d75a78a fixed elytras 2022-06-17 12:38:08 -05:00
unknown fb7390f61d fixed elytras 2022-06-17 12:37:03 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 0334127372 Merge pull request 'Remove wield view from player models' (#338) from MrRar/MineClone5:mesh into master 
Reviewed-on: MineClone5/MineClone5#338
 2022-06-17 17:36:57 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 087a665112 Merge pull request 'Fix l10n template for mcl_achivements' (#340) from MrRar/MineClone5:achievements into master 
Reviewed-on: MineClone5/MineClone5#340
 2022-06-16 18:17:49 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 3c346170a6 Fix l10n template for mcl_achivements 2022-06-14 13:30:59 -05:00
PrairieWind 615eae97ee Merge pull request 'Fix Blast Furnaces and Smokers' (#336) from PrairieAstronomer/MineClone5:blast_furnace_fixes into master 
Reviewed-on: MineClone5/MineClone5#336
 2022-06-12 02:33:29 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 6889c672c0 Remove wield view from player models 2022-06-11 18:00:42 -05:00
kay27 7becc4e01b Merge pull request 'Basic Pillagers' (#332) from MrRar/MineClone5:master into master 
Reviewed-on: MineClone5/MineClone5#332
 2022-06-11 21:37:57 +00:00
PrairieAstronomer 539ada1057 Adjusted README files. 2022-06-10 13:21:07 -06:00
PrairieAstronomer de29e05a6f Fixed Blast Furnaces and Smokers so they use groups to smelt, and put them into individual mods like in Mineclone2 2022-06-10 13:18:02 -06:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 6aef455fbc Merge pull request 'Buckets of Fish' (#335) from PrairieAstronomer/MineClone5:fish_bucket into master 
Reviewed-on: MineClone5/MineClone5#335
 2022-06-09 20:18:27 +00:00
PrairieAstronomer 977a77f871 Fixed some more white space formating in cod.lua 2022-06-09 13:04:36 -06:00
PrairieAstronomer 43e73e2856 Updated Translate Template and fixed the fish bucket definitions to work with the translation 2022-06-09 09:47:24 -06:00
PrairieAstronomer f17f51cce3 Fixed formatting whitespace issues on cod.lua and salmon.lua 2022-06-08 16:37:38 -06:00
PrairieAstronomer ebcadc415d Buckets of Fish 2022-06-08 13:07:01 -06:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 da4b867314 Merge pull request 'New Advancements and Nodes' (#326) from PrairieAstronomer/MineClone5:PrairieWind_commits into master 
Reviewed-on: MineClone5/MineClone5#326
 2022-06-08 18:02:16 +00:00
PrairieAstronomer 6cca004dbe Fixed whitespace in Sweet Dreams activation point 2022-06-08 10:54:36 -06:00
PrairieWind 6c84baac22 Merge branch 'master' into PrairieWind_commits 2022-06-07 22:02:49 +00:00
PrairieAstronomer 6ff27c0247 Fixed formatting in advancement definitions and in the award unlock code in the mcl_totem mod 2022-06-07 16:01:12 -06:00
3raven 6dbbe99d68 Merge pull request 'Fixing maps and clocks in itemframes' (#334) from 3raven/MineClone5:master into master 
Reviewed-on: MineClone5/MineClone5#334
Works on my computer (except pb mentioned above with older maps).
 2022-06-07 19:17:56 +00:00
3raven 7808c576a5 Update 2022-06-07 16:41:44 +00:00
3raven f968d76caa Update translation 2022-06-07 16:40:43 +00:00
3raven 7cab3b67e1 Update translation 2022-06-07 16:38:36 +00:00
3raven b79017d86e Update translation 2022-06-07 16:38:02 +00:00
3raven 6e9448c0b5 Update translation template 2022-06-07 16:35:22 +00:00
3raven c5655a40cd Update translation template-TODO update translations 2022-06-07 16:34:31 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 34586bef62 Pillagers: spawn with loaded crossbow 2022-06-07 07:48:42 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 836ef83bd1 Basic Pillagers 2022-06-06 13:06:36 -05:00
PrairieAstronomer cd75d6ffd2 Armor Advancement Definitions (Commented out, but ready for me to use later) 2022-06-03 10:38:51 -06:00
PrairieAstronomer 6c9fc8c963 Fishy Business Advancement 2022-06-01 10:22:10 -06:00
PrairieAstronomer 4abc8181f7 What A Deal! Advancement 2022-05-31 19:46:04 -06:00
3raven 36e671f439 Adjust light 2022-05-31 22:43:21 +00:00
3raven 5a3c1bb3d8 Move glowing itemframes 2022-05-31 22:15:36 +00:00
3raven 1b9c5e6e23 Move glowing itemframes 2022-05-31 22:14:17 +00:00
3raven 3b2483ff4f Move glowing itemframe 2022-05-31 22:13:27 +00:00
3raven b084071954 Move glowing itemframe 2022-05-31 22:09:13 +00:00
3raven ddcb7f141f Move glowing itemframe 2022-05-31 22:08:41 +00:00
3raven 36de9f53b7 Move glowing itemframe 2022-05-31 22:08:12 +00:00
3raven 493fb95e52 Move glowing itemframe 2022-05-31 22:07:30 +00:00
3raven 3ce0009181 Move glowing itemframes 2022-05-31 22:05:49 +00:00
3raven a97d6ec20d Move glowing itemframes 2022-05-31 22:04:15 +00:00
3raven 7b5cc25c6c Move glowing ink 2022-05-31 22:02:13 +00:00
3raven 7f1c09de59 Move glowing itemframes 2022-05-31 22:00:52 +00:00
3raven 80a7ab971a Move glowing itemframe to itemframe and glowing ink sac to glow_squid 2022-05-31 21:59:41 +00:00
3raven 6df9027971 Fleckenstein's fix for mcl2 2022-05-31 12:54:31 +00:00
3raven 0e1b4d8fea Adding tga_encoder (fleckenstein's) 
Adding tga_encoder for displaying maps (from here https://content.minetest.net/packages/erlehmann/tga_encoder/)
 2022-05-31 12:24:41 +00:00
3raven fa9a06a6d5 Add tga_encoder dependancy 2022-05-31 12:22:19 +00:00
3raven cc81b51128 fix map in itemframes 
Fix the map in iteframes problem in newly created worlds but might not work in older ones+ add tga dependancy
 2022-05-31 12:17:52 +00:00
3raven caac96b50e Attempt to fix map on itemframes pb by using EliasFlickenstein changes 2022-05-30 14:15:49 +00:00
3raven 50cbde6380 Atteempt to fix map on itemframe by using EliasFlickenstein in mcl2 2022-05-30 14:02:06 +00:00
3raven 8d79e5f7f7 Attempt to fix map on itemframe by using EliasFleckenstein changes from mcl2 2022-05-30 13:59:49 +00:00
PrairieAstronomer 3a12b9f6c6 Serious Dedication Advancement 2022-05-29 21:06:48 -06:00
PrairieAstronomer d4828f8993 Sweet Dreams Advancement 2022-05-29 19:11:21 -06:00
PrairieAstronomer 2a08c60602 Loom 2022-05-29 18:30:27 -06:00
PrairieAstronomer 53a1d7dd58 Fletching Table 2022-05-29 18:29:33 -06:00
PrairieAstronomer 80416fef71 Cartography Table 2022-05-29 18:28:34 -06:00
PrairieAstronomer f57cbcb0a0 Postmortal Advancement 2022-05-29 17:32:47 -06:00
3raven 8ccf1ae3a9 Attempt to get clock and map working in glowing itemframes 2022-05-29 09:28:29 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 9c19395dd7 Merge pull request 'make bell diggable by pickaxe' (#318) from bell_breaking into master 
Reviewed-on: MineClone5/MineClone5#318
 2022-05-17 18:30:17 +00:00
cora ee969531a8 make bell diggable by pickaxe 2022-05-17 09:05:25 +00:00
cora a7d3faee47 Merge pull request 'Fix mcl_wieldview showing unknown item after login' (#319) from MrRar/MineClone5:wieldview into master 
Reviewed-on: MineClone5/MineClone5#319
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-05-17 09:03:50 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 ff31e5d480 Fix mcl_wieldview showing unknown item after login 2022-05-16 12:38:25 -05:00
3raven 499f698ba7 Merge pull request 'master' (#314) from 3raven/MineClone5:master into master 
Reviewed-on: MineClone5/MineClone5#314

Soul fire replace regular fire on soul sand/soil (fix from cora's blackstone mod).
Upon ignition on soul sand/soil the fire is briefly yellow (before being replaced). It can be fixed by implementing directly soul fire in mcl_fire if deemed necessary.
 2022-05-10 15:49:12 +00:00
kay27 13dc68f40f Merge pull request 'Use baby_size to scale chick size on hatching instead of dividing by 2' (#305) from balazsszalab/MineClone5:master into master 
Reviewed-on: MineClone5/MineClone5#305
 2022-05-05 23:06:29 +00:00
kay27 27230fff4a Merge pull request 'Fix mcl_maps on Windows' (#304) from MrRar/MineClone5:maps into master 
Reviewed-on: MineClone5/MineClone5#304
 2022-05-04 22:07:51 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 00e54944fa Fix mcl_maps on Windows 2022-05-03 09:48:50 -05:00
3raven d17a50ecba Remove possibility to get soul fire in inventory by digging+minor fixes 2022-05-02 20:38:02 +00:00
3raven 49acbfed8e Fix from mcl2 blackstone by cora 
Changes taken from 
af5e3d84d4

Fire is briefly yellow upon ignition before becoming blue
 2022-04-30 22:08:08 +00:00