Resolve Conflicts #10

Merged

Snoweuph merged 8 commits from dev-scene into dev-base 2023-01-31 11:43:28 +00:00

Conversation 0 Commits 8 Files changed 118 +160 -2114

8 commits

Author	SHA1	Message	Date
snoweuph	2749ae37ef	Clearing .godot folder	2023-01-31 12:42:11 +01:00
snoweuph	058cc9258a	Update Gitignore	2023-01-31 12:40:57 +01:00
snoweuph	d31ac2d432	Merge branch 'dev-base' into dev-scene ... Get Godot4 into main-base branch	2023-01-31 12:38:01 +01:00
snoweuph	03c36f127b	Merge branch 'dev-base' into dev-scene	2023-01-31 12:34:36 +01:00
snoweuph	84293bb4dc	udate gitatributes	2023-01-31 12:26:42 +01:00
snoweuph	cca7a3c6ea	Update Git Atributes	2023-01-31 12:21:51 +01:00
snoweuph	111a5b2cde	Update to Godot 4	2023-01-31 12:17:59 +01:00
snoweuph	a4ffc972c3	remove plugin zip	2023-01-31 11:48:39 +01:00