1511 Commits

Author	SHA1	Message	Date
Marcel	f791f19edb	Merge branch 'Veloren_Kisa-master-patch-17326' into 'master' ... Upload New File See merge request veloren/veloren!2435	2021-06-13 21:55:53 +00:00
K. Kisa	883297d4cc	Upload New File	2021-06-13 13:30:42 +00:00
Monty	c17e3ad996	Cactus Colada ... Made cacti lootable Cactus colada recipe and item price balance fmt "make it 8 and drop it to 20 or 25? Not really sure tbh"	2021-06-13 13:52:56 +02:00
João Victor Cardoso Kdouk	228d2f05a6	Small fixes to pt_br language.	2021-06-09 14:36:10 +00:00
Marcel Märtens	e96dc21d30	fix swedish ron files	2021-06-07 12:02:02 +02:00
Marcel	97b7c8d68a	Merge branch 'master' into 'master' ... Update Swedish translation See merge request veloren/veloren!2380	2021-06-07 09:42:09 +00:00
Sam	0488b2fcd0	Adressed comments on energy and armor functions.	2021-06-07 11:06:25 +02:00
Snowram	76ca99ece4	Derive str from Material, better deserialization	2021-06-07 11:03:50 +02:00
jshipsey	4deeb42155	cave adjustments	2021-06-07 11:02:34 +02:00
jshipsey	1d23b7aebf	finalize stats ... t	2021-06-07 11:02:03 +02:00
jshipsey	9034d0f25d	comment addressing, cave tweaks	2021-06-07 11:01:46 +02:00
jshipsey	0e269b59d7	tooltip work	2021-06-07 11:01:32 +02:00
jshipsey	5fdb2ac01d	migration	2021-06-07 11:01:04 +02:00
Snowram	29a38e6d4f	Split tags into material class and material	2021-06-07 11:00:57 +02:00
Snowram	3fa7d0b6d4	Add material and armor class tags	2021-06-07 11:00:31 +02:00
jshipsey	7a573efab7	proper recipes, tanning racks, various fixes	2021-06-07 11:00:14 +02:00
jshipsey	8acd3832e3	more loot tables, overworld ores, more items	2021-06-07 11:00:00 +02:00
jshipsey	05de96c94b	ore deposits, flower drops	2021-06-07 10:59:50 +02:00
jshipsey	1c17d8fe5e	cave changes	2021-06-07 10:59:44 +02:00
jshipsey	754b60d810	crafting stations	2021-06-07 10:59:35 +02:00
jshipsey	58bd51a9e8	icon work, more models	2021-06-07 10:58:27 +02:00
jshipsey	18e9b5b890	recipes, re-organization, cleanup	2021-06-07 10:58:05 +02:00
jshipsey	74fbe9a123	cloth/metallic armor	2021-06-07 10:56:54 +02:00
jshipsey	ffc9a0ae22	more drops, armors	2021-06-07 10:56:16 +02:00
jshipsey	f387b8d259	hides/leathers	2021-06-07 10:56:04 +02:00
jshipsey	451ccf8d73	more meat	2021-06-07 10:55:50 +02:00
jshipsey	ca907f1b87	added some meat	2021-06-07 10:55:34 +02:00
Monty	336d83fc49	new bgs	2021-06-06 19:30:37 +02:00
Marcel	521e1eacf3	Merge branch 'aweinstock/add-models-20210603' into 'master' ... Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty. See merge request veloren/veloren!2371	2021-06-06 16:56:21 +00:00
hqurve	39fc48ac17	Widened recipe list in crafting menu and added quality indicators to names in the list	2021-06-06 15:55:11 +00:00
Filip Bengtsson	172c96d83d	Missed strings	2021-06-06 17:48:09 +02:00
Snowram	edfe713076	Cyclops, basilisk, air balloon offsets	2021-06-06 14:12:08 +02:00
Filip Bengtsson	cba9affbb3	Strings in various files	2021-06-06 01:05:08 +02:00
Filip Bengtsson	fcc266bfa8	Translate trade.ron	2021-06-06 00:42:50 +02:00
Filip Bengtsson	1b6c43dfe2	Translate social.ron	2021-06-06 00:42:07 +02:00
Filip Bengtsson	3e37549518	Translate sct.ron	2021-06-06 00:40:30 +02:00
Filip Bengtsson	5191a90432	Translate misc.ron	2021-06-06 00:39:55 +02:00
Filip Bengtsson	3cbf362462	Translate hud/map.ron	2021-06-06 00:34:06 +02:00
Filip Bengtsson	28c44b6bb9	Translate hud/hud_setting.ron	2021-06-06 00:32:16 +02:00
Filip Bengtsson	12ba5e1848	Translate hud/group.ron	2021-06-06 00:07:53 +02:00
Filip Bengtsson	1841923795	Translate hud/crafting.ron	2021-06-06 00:07:03 +02:00
Filip Bengtsson	f9e42f4107	Translate hud/chat.ron	2021-06-06 00:06:05 +02:00
Filip Bengtsson	10ac6b3d4c	Translate hud/char_window.ron	2021-06-06 00:00:51 +02:00
Filip Bengtsson	fd608ccb6f	Translate hud/bag.ron	2021-06-05 23:39:24 +02:00
Filip Bengtsson	f111b87fe5	template.ron boilerplate	2021-06-05 23:33:54 +02:00
Filip Bengtsson	6277106e78	Start translating skills.ron	2021-06-05 23:25:11 +02:00
Filip Bengtsson	cf051fd9fb	Translate main.ron	2021-06-05 23:13:42 +02:00
Filip Bengtsson	37c12977c1	Translate most of gameinput.ron	2021-06-05 23:08:59 +02:00
Filip Bengtsson	cb0f00d447	Translate esc_menu.ron	2021-06-05 23:04:55 +02:00
Filip Bengtsson	35f7c206e5	Translate most of common.ron	2021-06-05 23:03:48 +02:00