Commit Graph

8141 Commits

Author SHA1 Message Date
wallabra 5307908290
Merge branch 'master' into improve/creepers 2022-06-21 17:31:46 -03:00
wallabra 588afc72f0
Merge branch 'master' into improve/hoppers 2022-06-21 17:31:40 -03:00
wallabra d57097baef
Fix syntax error with hopper check 2022-06-20 20:37:15 -03:00
wallabra 54e9477f37
Fix hopper downpos priority check 2022-06-20 17:05:18 -03:00
wallabra 3502e504bf
Merge branch 'master' into improve/creepers 2022-06-20 16:45:22 -03:00
wallabra ff0e0dd36a
Merge branch 'master' into improve/hoppers 2022-06-20 16:45:11 -03:00
wallabra 218990c114
Merge branch 'master' into item-physics 2022-06-20 16:45:00 -03:00
balazsszalab 42fe7d8c73 Add sweet berry bush to bonemealable plants
Sweet berry bush advances 1 growth stage if bonemeal is applied on it.
2022-06-18 17:30:23 +00:00
balazsszalab 5b56acd415 Fix skipping growth stages of mcl_farming plants
Because usually math.ceil(intervals_counter)>=1, stages + math.ceil(intervals_counter)>=2. It causes the plants to skip growth stages and they usually grow two stages at once. Changing ceil to floor seems to solve the problem.
2022-06-18 16:40:50 +00:00
balazsszalab e2e4f7d2df Register sweet berry bush by add_plant function to enable plant growth
Without calling the add_plant function, sweet berry bushes will not go through growth stages and it is impossible to farm them. Sweet berry bush and beetroot have the same number of growth stages, so I used beetroot's interval and chance values here. If somebody has a better approximation of these values, feel free to change them.
2022-06-18 15:41:22 +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
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 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
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
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 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 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
cora ee969531a8 make bell diggable by pickaxe 2022-05-17 09:05:25 +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
AFCMS 48c8eaa6ed Remove 2D preview by AFCMS 2022-05-06 12:53:30 -05:00
AFCMS a4655a0c23 Fix player armor enchanting overlay (#2161) 2022-05-06 08:37:15 -05:00
AFCMS 4af046500d Remove preview files 2022-05-06 08:35:37 -05: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
balazsszalab 6ef292e80e Use baby_size to scale chick size on hatching instead of dividing by 2 2022-05-03 21:13:52 +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
kay27 76efcd4906 Merge testing into master (1.10) 2022-04-25 01:55:18 +03:00
3raven ab22628afe Merge pull request 'master' (#300) from 3raven/MineClone5:master into master
Reviewed-on: MineClone5/MineClone5#300

-Add Stripped and bark nether hyphae+hyphae stairs
-Make nether woods and nether wood doors non-flammable
-Put wooden door registration into a loop (like trapdoors)
2022-04-24 17:01:25 +00:00
3raven 010ffd695f Update translation template - TODO complete translation 2022-04-24 16:49:20 +00:00
3raven 6ffa01cac6 Update translation list - TO-DO: complete translations 2022-04-24 16:17:18 +00:00
3raven 2f0351fe6d Correct name 2022-04-24 16:16:33 +00:00
kay27 b70ae30fda Create MCL5 own mcl_end_crystal_beam texture 2022-04-23 22:02:23 +03:00
kay27 d0a8848487 Merge master into testing 2022-04-23 21:19:09 +03:00
kay27 cd02080ca8 Merge master into testing 2022-04-23 20:15:43 +03:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 b80e511cae Fix tools backwards in wieldview 2022-04-23 11:52:32 -05:00
River River 663c2bedbb Fix boat initialization failure 2022-04-23 23:20:38 +09:00
kay27 3a7363f11d Decrease spam activity reset interval from 300 to 30 s 2022-04-22 23:14:39 +03:00
Nils Dagsson Moskopp 033573ad63 Shuffle pixels in mcl_end_crystal_beam.png
A user claimed that this texture was a texture from Minecraft 1.8.9 –
see <MineClone2/MineClone2#2099> for
further details. I have not verified that but I noticed that in commit
152e55245804bd2b4790ee31454986948237d2a8 the file was replaced with a
file containing the exact same pixels.

A visual inspection confirms that the file contains noise, so it is not
clear if it is even copyrightable. However, to ensure that it could not
be identical to a file from Minecraft, To get noise of the same quality,
I have shuffled all its pixels with the following POSIX sh shell script:

LANG=C
PREFIX=mcl_end_crystal_beam
convert $PREFIX.png $PREFIX.pnm
<$PREFIX.pnm  >$PREFIX.plainpnm pnmtoplainpnm
<$PREFIX.plainpnm >$PREFIX.seed tr '1234567890 ' ' 1356902468'
(
 <$PREFIX.plainpnm head -n+3
 <$PREFIX.plainpnm tail -n+4 \
  |tr ' ' '\n' \
  |shuf --random-source $PREFIX.seed
) >$PREFIX.shuffled.plainpnm

I then opened mcl_end_crystal_beam.shuffled.plainpnm using GIMP,
converted the color black to tranparency and saved the image as a
paletted PNG (which yields a smaller filesize than a grayscale PNG).
2022-04-22 23:00:47 +03:00
kay27 c5e84a2704 Merge master into testing 2022-04-22 22:48:47 +03:00
kay27 f204470052 Merge pull request 'Lava produce sparks' (#292) from MrRar/MineClone5:lava into master
Reviewed-on: MineClone5/MineClone5#292
2022-04-22 19:47:17 +00:00
kay27 721e721427 Merge pull request 'Remove image stack wieldview' (#295) from MrRar/MineClone5:wieldview into master
Reviewed-on: MineClone5/MineClone5#295
2022-04-22 19:45:32 +00:00
CableGuy67 5432c6bd92 /spawnstruct placed schematics one block lower than player is standing
Because the position of the player is -0.5 from the block (when not flying) /spawnstruct would place the schematic a block lower than the player's feet.
2022-04-22 13:51:17 +00:00
3raven a8be87f88d Rangement 2022-04-20 22:57:27 +00:00
3raven 84320db3b7 Rangement 2022-04-20 22:50:40 +00:00
3raven 85a6f216f0 fix 2022-04-20 22:32:07 +00:00
3raven 01737dd551 Add Bark stairs and slab 2022-04-20 22:15:01 +00:00
3raven fec258cb99 Wrong recipe 2022-04-20 22:05:57 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 c5ad0d5f33 Remove image stack wieldview 2022-04-20 16:56:17 -05:00
3raven 9367c74e71 Add bark stairs and slab 2022-04-20 05:06:07 +00:00
3raven 3dcb969d75 fix 2022-04-20 04:32:13 +00:00
3raven ed29cd687b fix 2022-04-20 04:07:22 +00:00
3raven f57135259c fix 2022-04-20 03:42:54 +00:00
3raven c3ef5e93af Put door registration into a loop to have less lines of code 2022-04-20 03:37:28 +00:00
3raven df8dab3fac Makes nether wood fences unflammable 2022-04-20 01:47:39 +00:00
3raven 04c62e475e makes nether wood trapdoors unflammable 2022-04-20 01:42:50 +00:00
3raven 44c2c26265 make nether woods doors unflammable 2022-04-20 01:35:48 +00:00
3raven 4850b914a4 Non flammable/modify by similiraty with trees 2022-04-20 00:29:44 +00:00
3raven 1d331313d7 Same for crimson hyphae 2022-04-19 23:25:21 +00:00
3raven 9010305df4 Add stripped warped stuff 2022-04-19 22:55:48 +00:00
3raven 0200e25781 Add warped hyphae stripped and bark 2022-04-19 22:35:18 +00:00
3raven 8153487290 Add texture files for stripped stem
Add texture files for stripped stem
2022-04-19 21:11:01 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 b6a4c1a995 Lava sparks: performance improvement 2022-04-19 08:01:56 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 f0b8e8ea11 Lava produce sparks 2022-04-15 13:56:49 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 d0fcab11e9 Merge pull request 'Armor wearing mobs' (#285) from MrRar/MineClone5:zarmor into master
Reviewed-on: MineClone5/MineClone5#285
2022-04-13 18:41:51 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 b7f3b8edd5 No sun damage wearing helment 2022-04-13 12:52:39 -05:00
3raven 9b04b285b7 Make the shield drop at death 2022-04-12 22:08:33 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 1d315c569f Bonus: Mobs Redo bug fix 2022-04-10 14:05:15 -05:00
3raven c6f09e30a5 Mise à jour de 'mods/ITEMS/mcl_lanterns/register.lua' 2022-04-09 19:49:59 +00:00
3raven a47e0d2f17 Mise à jour de 'mods/ITEMS/mcl_lanterns/init.lua' 2022-04-09 19:49:23 +00:00
3raven a1ca0c3431 Mise à jour de 'mods/ITEMS/mcl_lanterns/register.lua' 2022-04-09 19:31:56 +00:00
3raven c72c960e8a Mise à jour de 'mods/ITEMS/mcl_lanterns/init.lua' 2022-04-09 19:29:52 +00:00
3raven 0184925890 Mise à jour de 'mods/ITEMS/mcl_lanterns/local/mcl_lanterns.fr.tr' 2022-04-09 19:26:04 +00:00
3raven 44d32b5d17 fix 2022-04-09 12:12:07 +00:00
3raven 07d564b5a2 Mise à jour de 'mods/ITEMS/mcl_beds/init.lua' 2022-04-09 12:05:00 +00:00
3raven 1e431814bc Mise à jour de 'mods/ITEMS/mcl_lanterns/init.lua' 2022-04-09 11:48:43 +00:00
3raven 337b4e1d05 Mise à jour de 'mods/ITEMS/mcl_lanterns/register.lua' 2022-04-09 11:47:14 +00:00
3raven f052e26e0c fix 2022-04-09 11:43:47 +00:00
3raven c55aab9360 Update french translation 2022-04-09 10:31:13 +00:00
3raven 421c1e8d00 Ajouter 'mods/MAPGEN/mcl_villages/locale/mcl_villages.fr.tr' 2022-04-09 10:21:26 +00:00
3raven 3591ef1fae French translation 2022-04-09 09:59:27 +00:00
3raven 47ed81490a french translation 2022-04-09 09:52:46 +00:00
3raven 609653eaf2 Update french translation 2022-04-09 09:44:49 +00:00
3raven f828ee6a19 Mise à jour de 'mods/HUD/mcl_achievements/locale/template.txt' 2022-04-09 09:28:36 +00:00
3raven e14545a2b8 French translation 2022-04-09 08:51:53 +00:00
3raven c3111c99b2 French translation 2022-04-09 08:49:47 +00:00
3raven 140fd67686 Add french translation 2022-04-09 08:07:47 +00:00
3raven 700200958d wrong place 2022-04-09 08:03:37 +00:00
3raven 8cd3b63fae Add Translations 2022-04-09 08:02:22 +00:00
3raven 4c957a3e7c Add Translation 2022-04-09 08:01:16 +00:00
3raven 2b87fb2cd2 Update french translation 2022-04-09 07:51:40 +00:00
3raven cbfac60742 Mise à jour de 'mods/ITEMS/mcl_furnaces/locale/template.txt' 2022-04-09 07:45:41 +00:00
3raven f46d093038 remove doublon 2022-04-09 07:44:09 +00:00
3raven cc300971b3 Update 2022-04-09 07:42:19 +00:00
3raven 9dd85f9f7b Update french translation 2022-04-09 07:12:24 +00:00
3raven 7f34c979ff update 2022-04-09 06:49:31 +00:00
3raven 6afda0af92 Update french translation 2022-04-09 06:42:51 +00:00
3raven f60588cf25 Update
Please when you add stuff update the template.txt and not just one translation file
2022-04-09 06:38:04 +00:00
3raven fd94fba22c Update french translation 2022-04-09 06:15:06 +00:00