beito123 f5866d7f72 Merge remote-tracking branch 'upstream/master' ...

# Conflicts:
#	core/assets/bundles/bundle_ja.properties

2019-03-06 14:59:38 +09:00

..

bundles

Merge remote-tracking branch 'upstream/master'

2019-03-06 14:59:38 +09:00

cursors

Successful desktop compilation

2018-12-26 17:38:40 -05:00

fonts

Bugfixes of various kinds

2018-11-13 09:13:53 -05:00

maps

Impact map balance / Block balance / Editor block sorting

2019-03-03 19:54:20 -05:00

shaders

Build shader swap

2019-02-26 16:02:06 -05:00

sprites

Bugfixes / Sprite tweak

2019-03-05 09:53:37 -05:00