[DiscordArchive] k so if im reading the git stuff on merge conflics right, my changes should be between the ==== and
[DiscordArchive] k so if im reading the git stuff on merge conflics right, my changes should be between the ==== and
Original source
k so if im reading the git stuff on merge conflics right, my changes should be between the ==== and >>>> bits right?
rektbyfaith
07-22-2024, 04:44 PM #1Archived author: Ĝ̷̳r̸̹͊a̷̜̚k̴̞̔ • Posted: 2024-07-22T16:44:08.884000+00:00
Original source
k so if im reading the git stuff on merge conflics right, my changes should be between the ==== and >>>> bits right?
Original source
so wh ythe fuck is it saying theres a merge conflic
![[Image: image.png?ex=690c27b0&is=690ad630&hm=0a6...6fd4f36c0&]](https://cdn.discordapp.com/attachments/415944535718494208/1264986452845137931/image.png?ex=690c27b0&is=690ad630&hm=0a6dc95eebae3f7f54375352da677584d87732f8d1127832851c1a96fd4f36c0&)
rektbyfaith
07-22-2024, 04:44 PM #2Archived author: Ĝ̷̳r̸̹͊a̷̜̚k̴̞̔ • Posted: 2024-07-22T16:44:32.727000+00:00
Original source
so wh ythe fuck is it saying theres a merge conflic
Original source
oh its also up here, i somehow edited this line?
![[Image: image.png?ex=690c2831&is=690ad6b1&hm=b2a...f5f7916d1&]](https://cdn.discordapp.com/attachments/415944535718494208/1264986991905345662/image.png?ex=690c2831&is=690ad6b1&hm=b2a3278a6404e1ee6991ccc84e50d49c4c6a7a057a918befcb9e967f5f7916d1&)
rektbyfaith
07-22-2024, 04:46 PM #3Archived author: Ĝ̷̳r̸̹͊a̷̜̚k̴̞̔ • Posted: 2024-07-22T16:46:41.267000+00:00
Original source
oh its also up here, i somehow edited this line?
Original source
Sooooo now that the website is gone, is there still a link to the PSD somewhere? ^^
rektbyfaith
07-22-2024, 05:00 PM #4Archived author: Barrow • Posted: 2024-07-22T17:00:26.717000+00:00
Original source
Sooooo now that the website is gone, is there still a link to the PSD somewhere? ^^
Original source
so for this time just deleting mine nad repulling worked. but in future im gonna have to figure out how to do this properly
rektbyfaith
07-22-2024, 05:20 PM #5Archived author: Ĝ̷̳r̸̹͊a̷̜̚k̴̞̔ • Posted: 2024-07-22T17:20:50.107000+00:00
Original source
so for this time just deleting mine nad repulling worked. but in future im gonna have to figure out how to do this properly
Original source
Aha! I had updated AreaTable, but I missed WMOAreaTable. And .gobject will do; though after using it for a few minutes I really wish the chat window was more robust.
rektbyfaith
07-22-2024, 05:28 PM #6Archived author: Cyclone Jack • Posted: 2024-07-22T17:28:32.048000+00:00
Original source
Aha! I had updated AreaTable, but I missed WMOAreaTable. And .gobject will do; though after using it for a few minutes I really wish the chat window was more robust.
Original source
If you're using TC i generally find it easiest to set this config `Calculate.Gameoject.Zone.Area.Data = 1` let world server start, then it will populate areaid column of gameobjects and you can query by that to narrow down
rektbyfaith
07-22-2024, 05:36 PM #7Archived author: Deleted User • Posted: 2024-07-22T17:36:05.136000+00:00
Original source
If you're using TC i generally find it easiest to set this config `Calculate.Gameoject.Zone.Area.Data = 1` let world server start, then it will populate areaid column of gameobjects and you can query by that to narrow down
Original source
I had to search for a while in my Downloads folder, but I'm glad now I never purge this folder, for times like this.
https://www.mediafire.com/file/xn6tnfxo8...e.zip/file
[Embed: template]
https://www.mediafire.com/file/xn6tnfxo8...e.zip/file
rektbyfaith
07-22-2024, 05:52 PM #8Archived author: Loadren • Posted: 2024-07-22T17:52:59.518000+00:00
Original source
I had to search for a while in my Downloads folder, but I'm glad now I never purge this folder, for times like this.
https://www.mediafire.com/file/xn6tnfxo8...e.zip/file
[Embed: template]
https://www.mediafire.com/file/xn6tnfxo8...e.zip/file
1 Guest(s)
1 Guest(s)