f1a3223d20
Merge remote-tracking branch 'upstream/master'
2025-03-20 11:42:53 +01:00
0a93b0f8df
Merge remote-tracking branch 'upstream/master'
2024-09-15 09:17:13 +02:00
8e189f01fa
Merge remote-tracking branch 'upstream/master'
2023-11-22 23:41:35 +01:00
8f8552b77d
Merge remote-tracking branch 'upstream/master'
2023-06-11 15:07:24 +02:00
15300a4413
Merge remote-tracking branch 'upstream/master'
2023-06-06 00:03:55 +02:00
0f8f31d5c8
Merge remote-tracking branch 'upstream/master'
2022-08-26 15:01:27 +02:00
78114b83cf
Merge branch 'crabman77-fix_spear'
2022-08-20 20:35:14 +02:00
6cd70d2759
Fix spears visuel bug issue nalc/nalc-server-mods#103
2022-07-21 17:58:33 +02:00
3b98245930
Merge remote-tracking branch 'upstream/master'
2022-06-25 16:49:30 +02:00
d667e39851
Merge remote-tracking branch 'upstream/master'
2022-05-27 18:34:18 +02:00
680f8e8995
Merge remote-tracking branch 'upstream/master'
2022-03-06 16:31:31 +01:00
3d63271855
Merge remote-tracking branch 'upstream/master'
2021-06-20 17:10:29 +02:00
e0bc27c825
Merge remote-tracking branch 'upstream/master'
2021-04-17 13:48:14 +02:00
2814f672f0
Merge remote-tracking branch 'upstream/master'
2021-04-04 20:59:35 +02:00
2ba84b1e3c
Merge remote-tracking branch 'upstream/master'
2021-03-12 12:20:39 +01:00
00d935de60
Merge branch 'gitlab'
2021-03-02 23:45:38 +01:00
6700f2b935
Fix use_texture_alpha for homedecor:skylight_frosted
2021-03-02 23:42:06 +01:00
6e973c3830
Merge remote-tracking branch 'upstream/master'
2021-03-02 23:11:41 +01:00
177a97eab3
Merge remote-tracking branch 'upstream/master'
2021-01-31 13:39:49 +01:00
a832b66977
Merge remote-tracking branch 'upstream/master'
2021-01-29 17:42:33 +01:00
df9e8aea4b
Merge remote-tracking branch 'upstream/master'
2021-01-24 12:40:06 +01:00
99a01301a8
Merge remote-tracking branch 'upstream/master'
2020-12-03 20:50:27 +01:00
2ef259fa24
Merge remote-tracking branch 'upstream/master'
2020-11-25 21:53:41 +01:00
caaa963eaf
Merge remote-tracking branch 'upstream/master'
2020-10-14 21:31:35 +02:00
e5866b7928
Merge remote-tracking branch 'upstream/master'
2020-10-12 18:43:38 +02:00
b6ecc0b95f
Merge remote-tracking branch 'upstream/master'
2020-10-09 19:30:42 +02:00
320cd1d449
Merge remote-tracking branch 'upstream/master'
2020-09-15 21:39:14 +02:00
3675e9c266
Merge remote-tracking branch 'upstream/master'
2020-08-19 21:23:52 +02:00
3567b42c39
Merge remote-tracking branch 'upstream/master'
2020-08-08 10:04:04 +02:00
bd67ba2499
Merge remote-tracking branch 'upstream/master'
2020-08-04 20:48:58 +02:00
5612f4c884
Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev
2020-06-16 22:26:41 +02:00
7bcfbbca3a
Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev
2020-02-09 21:38:24 +01:00
e372ccb4d8
Merge branch 'master' of yunohost:mtcontrib/homedecor_modpack into nalc-1.2-dev
2019-12-22 13:26:45 +01:00
5c6a994698
Merge branch 'nalc-1.2' of yunohost:nalc/homedecor_modpack into nalc-1.2
2019-05-26 19:11:29 +02:00
1eec6e3615
Merge branch 'master' into nalc-1.2
2019-05-26 19:07:00 +02:00
0753606eb0
Merge branch 'master' into nalc-1.2
2019-05-25 15:36:01 +02:00
778b5493c7
Merge branch 'master' into nalc-1.2
2019-05-09 22:11:30 +02:00
fb0ca9a15c
Supprime 2 dossiers non supprimés par le merge précédent
2019-05-04 20:45:50 +02:00
1520d27a73
Merge branch 'master' into nalc-1.2
2019-05-04 19:25:15 +02:00
5d4c64d3b2
Corrige problème de stack des lampes dans inventaire après récolte.
...
L'auteur du mod a oublié de définir la variable drop des objets
concernés :
- homedecor:glowlight_half,
- homedecor:glowlight_quarter,
- homedecor:glowlight_small_cube,
- homedecor:standing_lamp_off,
- homedecor:desk_lamp.
2019-04-07 14:04:00 +02:00
4eb9ffb088
Ajoute messages de chargement des mods dans le journal "action"
2018-12-25 17:41:16 +01:00