4 Commits

Author	SHA1	Message	Date
EljakimHerrewijnen	be32ae730c	Fixed unresolved merge conflicts	2020-10-06 14:03:54 +02:00
Jonathan Herrewijnen	ea1793a270	Trying to fix merge	2020-10-03 16:07:27 +02:00
Jonathan Herrewijnen	0d089b391c	Semi working inventory, part 2 still to do. Changed all textures to without filter, to increase pixelated look of the pixel art.	2020-10-03 16:00:15 +02:00
EljakimHerrewijnen	a6fc79e22d	Added buttons, pushing before cleanup	2020-10-03 14:13:19 +02:00