Skip to content

Zapdupdate#2292

Closed
louist103 wants to merge 21 commits intoHarbourMasters:developfrom
louist103:ZAPDUPDATE
Closed

Zapdupdate#2292
louist103 wants to merge 21 commits intoHarbourMasters:developfrom
louist103:ZAPDUPDATE

Conversation

@louist103
Copy link
Contributor

@louist103 louist103 commented Dec 28, 2022 •
edited by github-actions bot
Loading

@briaguya0 briaguya0 force-pushed the develop branch 2 times, most recently from 05bd4a3 to ba13e6b Compare January 17, 2023 05:34
louist103 and others added 17 commits April 29, 2023 00:12
@louist103
git subrepo clone --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/
ce2df38 
subrepo:
  subdir:   "ZAPDTR"
  merged:   "6aa54a551"
upstream:
  origin:   "C:/ZeldaStuff/ZAPDTR"
  branch:   "rebase2"
  commit:   "6aa54a551"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
@louist103
git subrepo clone --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/
f731c8f 
subrepo:
  subdir:   "ZAPDTR"
  merged:   "88b012240"
upstream:
  origin:   "C:/ZeldaStuff/ZAPDTR"
  branch:   "rebase2"
  commit:   "88b012240"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
@louist103
Update (its broken)
9996712
@louist103
fix the enum
35beaff
@louist103
git subrepo push --remote=C:/ZeldaStuff/ZAPDTR/ ZAPDTR
196caf8 
subrepo:
  subdir:   "ZAPDTR"
  merged:   "b7b6e1c82"
upstream:
  origin:   "C:/ZeldaStuff/ZAPDTR/"
  branch:   "rebase2"
  commit:   "b7b6e1c82"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
@louist103
New names for LUS actions
b1c0174
@louist103
git subrepo push --remote=C:/ZeldaStuff/ZAPDTR/ ZAPDTR
13d9fd0 
subrepo:
  subdir:   "ZAPDTR"
  merged:   "c5cfebeee"
upstream:
  origin:   "C:/ZeldaStuff/ZAPDTR/"
  branch:   "rebase2"
  commit:   "c5cfebeee"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
@louist103
git subrepo clone (merge) --force --branch=rebase2 C:/ZeldaStuff/ZAPD…
dd6efa2 
…TR ZAPDTR/

subrepo:
  subdir:   "ZAPDTR"
  merged:   "d5f4769b8"
upstream:
  origin:   "C:/ZeldaStuff/ZAPDTR"
  branch:   "rebase2"
  commit:   "d5f4769b8"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
@louist103
Fix missing commands in the exporter.
befb66f
@louist103
Cleanups.
f0ff31f
@louist103
git subrepo pull --force --remote=https://github.com/harbourmasters/Z…
0fd2660 
…APDTR --branch=master ZAPDTR

subrepo:
  subdir:   "ZAPDTR"
  merged:   "d4c35b90a"
upstream:
  origin:   "https://github.com/harbourmasters/ZAPDTR"
  branch:   "master"
  commit:   "d4c35b90a"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
@louist103
Add unordered_map include to fix MacOS
c17ccdf
@louist103
fix string_view
22e0f99
@louist103
Update Main.cpp
0c03cd3
@louist103
fix string view
c71ec8d
@louist103
So close I can almost taste it
c800fa1
@louist103
So close
5d6150a
This was referenced Apr 29, 2023
Merged
Closed
@louist103 louist103 mentioned this pull request May 7, 2023
Merged
@louist103 louist103 closed this May 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@louist103