Samuel Keiffer 8e278a2124 Merge branch 'aweinstock/price-equality' into 'master' ...

Add a manifest for making different items count as the same item for the purpose of pricing.

See merge request veloren/veloren!2360

2021-06-02 23:48:45 +00:00

..

assets

Merge branch 'alphyr/guess_image_format' into 'master'

2021-05-12 18:41:22 +00:00

base

* Replaced diesel with rusqlite and refinery

2021-04-13 22:05:47 +00:00

benches

…

ecs

include origin into system name

2021-04-20 01:30:27 +02:00

frontend

Revert "Merge branch 'sharp/revert-quinn' into 'master'"

2021-05-21 10:41:16 +02:00

net

Update toolchain

2021-05-31 20:44:57 -04:00

src

Merge branch 'aweinstock/price-equality' into 'master'

2021-06-02 23:48:45 +00:00

state

Don't remesh chunk vertex data on sprite update.

2021-05-11 12:58:15 -07:00

systems

Re-disable incremental just for common-systems, small fix in plugin

2021-05-31 20:44:57 -04:00

build.rs

…

Cargo.toml

Added non-admin moderators and timed bans.

2021-05-09 21:19:16 -07:00