MeigoFried/GameVsJam
1
0
Fork 0
Code Issues 14 Pull Requests Packages Projects 1 Releases Wiki Activity

Revert "Merge branch 'main' of https://gitfrieds.nackenbox.xyz/MeigoFried/GameVsJam"

Browse Source 
This reverts commit 7a477817fe, reversing
changes made to 7c127ac68e.
This commit is contained in:
jankaminski1
2024-04-07 15:57:24 +02:00
parent 7a477817fe
commit a27478b727
33 changed files with 442 additions and 2659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
3d Prototyp/Assets/Models/Consumables/Bottle.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
<<<<<<<< HEAD:3d Prototyp/Assets/Animations.meta
guid: 3d1f4d0b2cd9e744f95c2317495413cb
guid: 6bc4a457dc2707f498400ffd8852bc42
========
guid: b5a1bf502fb00de4da1ab0b10ff7ca3f
>>>>>>>> 561a11e6d01bf2df9669da9e53bbf93264bb5dcb:3d Prototyp/Assets/Models/Consumables/Bottle.meta