These are chat archives for BSData/wh40k

10th
Jun 2017
James
@skonk
Jun 10 2017 00:00
yeh
ShadowsofVanity
@ShadowsofVanity_twitter
Jun 10 2017 00:00
as far as I understand it
James
@skonk
Jun 10 2017 00:00
Dark Apostle is missing the Mark option too, finding more stuff now so I'll go add a post @cartag so u can see em all
James
@skonk
Jun 10 2017 00:08
@cartag i've added a post with a few bits, other than that everything else from my 3k-ish list seems to match up fine
cartag
@cartag
Jun 10 2017 00:29
I only put the actual choices for Marks on the things that have icons, as that's the only place it matters right now. They all have the <Mark of Chaos> category though
James
@skonk
Jun 10 2017 00:29
cool
James
@miproductions
Jun 10 2017 00:29
could I get this reopened? BSData/wh40k#3782
James
@skonk
Jun 10 2017 00:30
i editing my post so it was all in 1 post rather then spread over several comments
edited^
cartag
@cartag
Jun 10 2017 00:31
that mark of chaos entry group is the most useless fuckign thing in that file
James
@skonk
Jun 10 2017 00:32
marks of chaos are, at the mo, 100% redundant in the rules other than to restrict marks
i hope they do more with marks later, other they could just roll Icons rules into the Marks
otherwise^
restrict icons even
i must be tired, cant even form sentence properly at the mop
MOP!
OftKilted
@OftKilted
Jun 10 2017 00:58
Okay ... question regarding Categories.
/waves @cartag
What defines a primary Category? Does a primary category do something different than a normal category?
Will Pattison
@GenWilhelm
Jun 10 2017 01:02
it defines which group it appears in when building a roster
for 40k it should be the FOC
OftKilted
@OftKilted
Jun 10 2017 01:02
Ahh ... gotcha.
So, for AoS, with the FoC equivalent being Leader (rather than HQ) One would choose, Leader' as the Primary. And Behemoth as a secondary.
The insanity of the Beta 8 files is pretty sweet.
or pre-8 files ... as they are.
Troy Graber
@tag8833
Jun 10 2017 01:18
Whoo. Only 6 more to go.
cartag
@cartag
Jun 10 2017 01:19
What @GenWilhelm said lol
Will Pattison
@GenWilhelm
Jun 10 2017 01:31
@alphalas, Adeptus Ministorum filename has a double space, just fyi
Jon Kissinger
@alphalas
Jun 10 2017 12:07
:+1: i'll get to it
@GenWilhelm or @Kohato can you purge the broken category links in the XML for Custodes and SoS? i can't edit and save right now because i can't get rid of the broken links
Earl Bishop
@DrTobogganMD
Jun 10 2017 12:09
Not til tonight :/
GitHub blocked at work
So I couldn't even grab it if I had time
Jon Kissinger
@alphalas
Jun 10 2017 12:09
:+1:
Earl Bishop
@DrTobogganMD
Jun 10 2017 12:09
But if it still needs@tonight I can open it up and fix quick
Troy Graber
@tag8833
Jun 10 2017 12:19
How do you quickly fix broken links like that?
Earl Bishop
@DrTobogganMD
Jun 10 2017 12:49
Category links are all at the top of xml
Simple select delete.
Troy Graber
@tag8833
Jun 10 2017 12:50
How do you know which ones are broken?
Earl Bishop
@DrTobogganMD
Jun 10 2017 12:57
Lol.
Match valid ones to ids
Then delete the ones left
Or wipe them out
And re link
Earl Bishop
@DrTobogganMD
Jun 10 2017 14:08
Has anyone tried iOS alpha
With the new repo
It's crashing on list view for me
Jon Kissinger
@alphalas
Jun 10 2017 14:40
Can confirm it's only on 8e repo
Earl Bishop
@DrTobogganMD
Jun 10 2017 14:41
Individual entries work fine
But overall list view crashes
cartag
@cartag
Jun 10 2017 14:41
is Cypher only in the Chaos book?
Earl Bishop
@DrTobogganMD
Jun 10 2017 14:41
Also shows an iOS error when attempting to export html text without going into list view
No
Imperium and chaos keywords
flakpanda
@flakpanda
Jun 10 2017 14:41
Yeah @cartag
cartag
@cartag
Jun 10 2017 14:42
Maybe I'm blind, but I couldn't find him in the Imp books
Earl Bishop
@DrTobogganMD
Jun 10 2017 14:42
Oh you mean on the book itself
cartag
@cartag
Jun 10 2017 14:42
I know he has the imperium keyword, but he's not in the others that I can see
CloverFox
@CloverFox
Jun 10 2017 14:42
he might only be in one book, but have keywords that work outside his book
Earl Bishop
@DrTobogganMD
Jun 10 2017 14:42
Yea only the chaos index
flakpanda
@flakpanda
Jun 10 2017 14:43
Are him and the fallen going in the GST?
cartag
@cartag
Jun 10 2017 14:43
Shit.
Well, there's a relatively poor quality image of fallen and cypher, I was hoping I could get a clearer shot
flakpanda
@flakpanda
Jun 10 2017 14:43
Because like 75% of 40k can use him
cartag
@cartag
Jun 10 2017 14:43
but, that's not happening, so...
Should we put him and Fallen in GST?
James
@skonk
Jun 10 2017 14:44
could do with someone nipping to their local game shop and sneaking a better photo of it
cartag
@cartag
Jun 10 2017 14:44
just have to do the links in the individual CATs
James
@skonk
Jun 10 2017 14:44
in the UK at least every game shop were sent copies to show to customers
cartag
@cartag
Jun 10 2017 14:44
My FLGS here has one too, I'm just impatient, don't want to wait the hour till they open, and really don't want to put pants on.
flakpanda
@flakpanda
Jun 10 2017 14:45
Flgs you might be able to. At GWs they won't show them off unless the manager is cool.
cartag
@cartag
Jun 10 2017 14:45
we've been playing games with them for the past week lol
Jon Kissinger
@alphalas
Jun 10 2017 14:45
I'll take a pic at my flgs
Will also confirm if he's in imp or not lol
cartag
@cartag
Jun 10 2017 14:47
I can still read this one, it's just potato quality
LIke week old mashed potato quality
Jon Kissinger
@alphalas
Jun 10 2017 14:51
So once we're done this nonsense, @cartag refactor AoS so we can do individual cats there too? Lol
cartag
@cartag
Jun 10 2017 14:51
I can do the detachments the same way they are here lol
If you think I'm undertaking chaos there like I have here, you need your head examined :D
I'm going to have to add the Chaos keyword to GST
flakpanda
@flakpanda
Jun 10 2017 14:52
The bigger thing with AoS is reworking the cats in general to make alliance categories work properly
cartag
@cartag
Jun 10 2017 14:53
nah, that'll be easy. Just set them up the same way they are here. The big 4 alliances will just be considered like Chaos or Imperium are here
no need to actually validate, I would hope our users are smart enough to... okay, nevermind, I see your point
Jon Kissinger
@alphalas
Jun 10 2017 14:54
I didn't say you need to take over chaos lol
cartag
@cartag
Jun 10 2017 14:54
Good lol
Jon Kissinger
@alphalas
Jun 10 2017 14:55
Just help set everything up so we're not always telling people no you can't work on it right now because there are only 4 cats lol
cartag
@cartag
Jun 10 2017 14:55
I realize my mental state goes from being absolutely worthless to 10' tall and bulletproof, but even I know my limits ;)
That I can do
flakpanda
@flakpanda
Jun 10 2017 14:55
I had actually started to work on chaos before all this 8th nonsense dropped
Peter Zaitcev / [USSX] Hares
@USSX-Hares
Jun 10 2017 14:57
Is there any option to open 8th. ed. catalogs in iPad?
Jon Kissinger
@alphalas
Jun 10 2017 14:57
Didn't the iOS update go to iPad?
Peter Zaitcev / [USSX] Hares
@USSX-Hares
Jun 10 2017 14:58
which update?
Jon Kissinger
@alphalas
Jun 10 2017 14:58
The BS update
Or do you mean to put repo on iOS?
Peter Zaitcev / [USSX] Hares
@USSX-Hares
Jun 10 2017 14:58
repo
James
@skonk
Jun 10 2017 14:58
Has anything change in the CSM cat since yesterday that you ant testing btw?
cartag
@cartag
Jun 10 2017 14:58
Not live on app store, if it's still an alpha we'd need Test Flight and a redemption code
yes, I just haven't uploaded yet
Jon Kissinger
@alphalas
Jun 10 2017 14:59
I just got an iOS update yesterday or day before
James
@skonk
Jun 10 2017 14:59
ah
cartag
@cartag
Jun 10 2017 14:59
just uploaded new, Cypher and Fallen are not in it yet
James
@skonk
Jun 10 2017 15:00
nice one, i'll have a play with it
Jon Kissinger
@alphalas
Jun 10 2017 15:00
Peter - pretty much to get the new repo on iOS you need Dropbox
At least afaik
What I do is import from from file from my git folder into BS, then sync Dropbox to iOS
cartag
@cartag
Jun 10 2017 15:10
I just created a repository in my dropbox, we'll see if it can be shared properly...
It's still syncing
James
@skonk
Jun 10 2017 15:13
i'll give it a go
cartag
@cartag
Jun 10 2017 15:14
wts...
Try that
shit.
James
@skonk
Jun 10 2017 15:20
1) Premature end of file.
cartag
@cartag
Jun 10 2017 15:21
forget I said anything
James
@skonk
Jun 10 2017 15:21
i dont see why iot wouldnt work
i'll try it with ?raw=1
James
@skonk
Jun 10 2017 15:22
?raw=1 worked
cartag
@cartag
Jun 10 2017 15:22
full link?
cartag
@cartag
Jun 10 2017 15:23
404 error when importing.... fml
I'll get it up later
James
@skonk
Jun 10 2017 15:24
odd
all looks good in here now apart from drakes still dont have a PL cost
cartag
@cartag
Jun 10 2017 15:24
WHAT THE EVERLOVING FUCK
I've set that six times now
James
@skonk
Jun 10 2017 15:25
odd
Jon Kissinger
@alphalas
Jun 10 2017 15:48
James
@skonk
Jun 10 2017 15:49
:)
Will Pattison
@GenWilhelm
Jun 10 2017 15:59
there you go @alphalas
cartag
@cartag
Jun 10 2017 16:08
Gracias
Jon Kissinger
@alphalas
Jun 10 2017 16:09
Dankeschoen @GenWilhelm
Bitteschoen @cartag
flakpanda
@flakpanda
Jun 10 2017 16:12
Can anyone reproduce the scout issue in #3739
cartag
@cartag
Jun 10 2017 16:17
proof, in case it happens again
image.png
Cypher and Fallen are up and in the GST
flakpanda
@flakpanda
Jun 10 2017 16:18
Lol @cartag
Amadeusz Sadowski
@amis92
Jun 10 2017 16:19
We still don't know if you commited this @cartag lol xD
cartag
@cartag
Jun 10 2017 16:19
Just did actually
image.png
That fucking heldrake has caused me more stress....
Leanden
@Leanden
Jun 10 2017 16:32
Has that dropbox link been moved? Im getting an error 404.
cartag
@cartag
Jun 10 2017 16:35
it's not working for me either @Leanden and I'm the one who made it lol
flakpanda
@flakpanda
Jun 10 2017 16:36
damn, i ment #3797 earlier
stoopid mobile
Will Pattison
@GenWilhelm
Jun 10 2017 16:39
yeah, couldnt see anything wrong @flakpanda
flakpanda
@flakpanda
Jun 10 2017 16:39
ok, because i couldnt either
Leanden
@Leanden
Jun 10 2017 16:54
Cartag, even when i just click the link it is error 404.
Perhaps your privacy settings are wrong?
Why doesnt the 8thpreprepo just have an index.bsi in and save all the hassle. The gst and cat files are all present and ive managed to import these manually on the desktop.
but on ios you need the index to download the repo
James
@skonk
Jun 10 2017 17:03
@cartag the Helldrake............. has a PL now :)
Jon Kissinger
@alphalas
Jun 10 2017 17:06
Or you sync to your own Dropbox like I explained earlier
Leanden
@Leanden
Jun 10 2017 17:08
Im synced to my own dropbox already, but i dont have the files there.
where can i get the index file?
Oh you mean sync from my desktop to the dropbox and in turn to the app?
flakpanda
@flakpanda
Jun 10 2017 17:28
was shrike always a chapter master?
i guess not:
Jon Kissinger
@alphalas
Jun 10 2017 17:44
No he became CM in Mont'Ka
@Leanden correct
flakpanda
@flakpanda
Jun 10 2017 17:44
oh. didnt read mont'ka
Jon Kissinger
@alphalas
Jun 10 2017 17:45
Yeah Farsight killed the RG CM
flakpanda
@flakpanda
Jun 10 2017 17:45
well i knew he use to be 3rd company captain
i didnt realize vulkan wasnt the chapter master
Jon Kissinger
@alphalas
Jun 10 2017 17:47
Yeah he's just a dude
flakpanda
@flakpanda
Jun 10 2017 17:49
hmm… sergeant chrous + techmarine is one vehicle is healed D3+1 wounds a turn
and 2+ BS regardless of wounds lost
ShadowsofVanity
@ShadowsofVanity_twitter
Jun 10 2017 18:16
least favorite thing about new addition is that I cant heal my Imperial Knights with my Techmarines anymore
flakpanda
@flakpanda
Jun 10 2017 18:16
because it has to be <chapter> now
ShadowsofVanity
@ShadowsofVanity_twitter
Jun 10 2017 18:17
yepppp
flakpanda
@flakpanda
Jun 10 2017 18:17
anything from ad mech for blanket vehicle healing?
ShadowsofVanity
@ShadowsofVanity_twitter
Jun 10 2017 18:17
nope
has to be <Forgeworld>
so I cant do that either
sadface
flakpanda
@flakpanda
Jun 10 2017 18:17
i think im ok with this
ShadowsofVanity
@ShadowsofVanity_twitter
Jun 10 2017 18:18
fortunatly I run a crusader pattern, so I can keep it in the back and shoot :P
Simon Porter
@FarseerVeraenthis
Jun 10 2017 18:27
that feeling when you try to merge, have a conflict, can't fix it, overwrite your file and lose a load of work :-(

wherewasthebackup

:sad:
:cry:
flakpanda
@flakpanda
Jun 10 2017 18:30
?
Simon Porter
@FarseerVeraenthis
Jun 10 2017 18:31
I made a cock up
I've been working with @USSX-Hares on the Eldar CAT, I just tried to sync and it said there were conflicts..
but I thought, that's cool, I can just download it again from the sever because that file will have both mine and his content in it right?! apparently not :-(
so either I can somehow recover the file I just deleted, or re-enter all the work I did on flyers yesterday :-1:
flakpanda
@flakpanda
Jun 10 2017 18:33
you synced to the same folder your copy was that had confilcts?
CloverFox
@CloverFox
Jun 10 2017 18:34
@FarseerVeraenthis did you do a push at any point?
Simon Porter
@FarseerVeraenthis
Jun 10 2017 18:34
I commited my latest version of the file yesterday
flakpanda
@flakpanda
Jun 10 2017 18:34
just download you lastest commit then
Simon Porter
@FarseerVeraenthis
Jun 10 2017 18:34
how do I do that??
CloverFox
@CloverFox
Jun 10 2017 18:35
commit is not the same as push, commit saves the diff to your local copy, push then pushes that to the server
if you didn't push it wont end up in the remote, and if you deleted your local copy then those changes will be lost
Daniel Mudd
@btjmp
Jun 10 2017 18:37
I don't see how you could've deleted your local commit copy without, like, deleting the entire folder though
It should be somewhere in your log
That or you've somehow entirely mangled your history
Simon Porter
@FarseerVeraenthis
Jun 10 2017 18:38
right, total crisis averted... it appears I've only lost my last commit, which was the three flyers
Daniel Mudd
@btjmp
Jun 10 2017 18:38
It should definitely still be there, assuming you a) committed and b) haven't deleted the folder or your .git directory
Simon Porter
@FarseerVeraenthis
Jun 10 2017 18:38
and I did delete the entire folder, because I (wrongly) though that the file on the site would include everything
Daniel Mudd
@btjmp
Jun 10 2017 18:38
Ah
Then yep, that's lost to time
Simon Porter
@FarseerVeraenthis
Jun 10 2017 18:39
so I just re-downloaded the .zip and extracted it again
Earl Bishop
@DrTobogganMD
Jun 10 2017 18:39
Wait how did nobody notice Simon said cock up
Simon Porter
@FarseerVeraenthis
Jun 10 2017 18:39
so yes, back up to 6 dtasheets, rather than thtee..
flakpanda
@flakpanda
Jun 10 2017 18:39
Or go into your recycle bin and undelete it
We did @Kohato
Simon Porter
@FarseerVeraenthis
Jun 10 2017 18:40
that would work, but I didn't delete it, I just overwrote it
(can you tell I don't actually work in IT and I just do this "for fun")
it's cool, it's only three datasheets, I'll just write them up again :-)
and put this down as a learning experience that I am quite happy working on my little branch
and I should learn how to resolve conflicts before making a mess
flakpanda
@flakpanda
Jun 10 2017 18:42
Oh, yeah. Overwritten files are lost
Simon Porter
@FarseerVeraenthis
Jun 10 2017 18:45
at least I know now that I was on borrowed time, and I was lucky only to lose 3 datasheets as opposed to the entire Index
Jon Kissinger
@alphalas
Jun 10 2017 19:17
So, custodes are kinda dicks
Trygon consolidated into a 5 man sentinel custodes squad - they proceeded to nuke it in their activation
Jon Kissinger
@alphalas
Jun 10 2017 19:50
Hey BA guy - ASM plain dudes have no points ATM
Simon Porter
@FarseerVeraenthis
Jun 10 2017 19:58
so, just to complete my understanding of my cock-up from earlier... I thought a commit on the branch == a pull request from a different branch. But apparently that is not the case... So now I will always pull and merge when I finish for the evening
Daniel Mudd
@btjmp
Jun 10 2017 20:07
Okay, so a commit is just a list of changes you've made to files - known as a "diff". Pushes send those changes from your local machine to the server.
Pulling gets all the commits from the remote repository (the server) and adds them to your local repository
When pulling, rather than merging and filling the commit history with merge commits, you could potentially rebase assuming there's no conflicts
It essentially isolates your commits, pulls all the other ones then replays yours on top of them
Otherwise, it has to merge the two different versions of the branch - your local one, with your changes, and the remote one, with other peoples' changes
Rebasing resets your local repository to the last commit before any remote changes, applies all the remote changes, then applies yours on top of them
So there's no different branch version merging going on
A pull request is just "hey, I've done some commits, could you add this code to your repository?"
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:10
righto, yeah, I kinda get it, it all makes sense now I've had it demonstrated rather definitely :smile:
Daniel Mudd
@btjmp
Jun 10 2017 20:10
It's just a list of commits from a different branch or fork that gets merged in
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:11
but yes, thank you for the additional explanation :-)
Daniel Mudd
@btjmp
Jun 10 2017 20:11
My explanation may not be 100% technically accurate but it's close enough
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:12
see, I've been working directly on the branch, rather than branching for myself. When the branch becomes the master I'll branch and then when I finish working merge the branch...
CloverFox
@CloverFox
Jun 10 2017 20:12
the explanation get a :thumbsup: from me
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:12
I just didn't realise I had to pull / merge directly on the branch as well :smile:
but I do now :+1:
I'm just glad it is only 3 data sheets and some tidying up, rather than 10 or 12 sheets
CloverFox
@CloverFox
Jun 10 2017 20:14
I work in a fork, which is basically an entire copy of the repo, so i can mess around and commit and push all I like without fear of messing up the main repo, then i can merge the upstream (the main server) into my own, then commit a pull request, its a little more complicated to set up but it affords me peace of mind
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:18
yeah, usually I work on a branch, but i didn't think a branch of a branch was necessary... I was apparently worng :smile:
I'm all groovy now, I have heavy metal, everything will be fine :+1:
(and headphones)
cartag
@cartag
Jun 10 2017 20:26
okay, why did all my files just get updated?
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:27
:wink:
cartag
@cartag
Jun 10 2017 20:27
a wink isn't an answer
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:27
mistakes were made
I can only apologise
cartag
@cartag
Jun 10 2017 20:28
okay....
Peter Zaitcev / [USSX] Hares
@USSX-Hares
Jun 10 2017 20:28

@Bitjump

I don't see how you could've deleted your local commit copy without, like, deleting the entire folder though

git rebase

cartag
@cartag
Jun 10 2017 20:29
what happened?
Peter Zaitcev / [USSX] Hares
@USSX-Hares
Jun 10 2017 20:29
read manual
cartag
@cartag
Jun 10 2017 20:29
and do I need to re-upload everything
Daniel Mudd
@btjmp
Jun 10 2017 20:29
@USSX-Hares When someone's asking about what a commit is, I assume they aren't trying to rebase
Peter Zaitcev / [USSX] Hares
@USSX-Hares
Jun 10 2017 20:30
Can you explain?
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:30
basically I reached the limit of my knowledge/understanding, and acted with good intent..
but what happened was I basically re-wrote my local copy of everything and then commited that update to the branch
but iut appears to have updated everything for everyone
cartag
@cartag
Jun 10 2017 20:30
So we need to reupload?
Daniel Mudd
@btjmp
Jun 10 2017 20:31
Alternatively we just revert that commit and @FarseerVeraenthis fixes their local before committing again
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:31
you shouldn't really need to, because unless you committed between when I downloaded and re-committed surely it shouldn't make any difference
???
fingers crossed
cartag
@cartag
Jun 10 2017 20:32
Differences in CSM are too numerous to show in a preview
Daniel Mudd
@btjmp
Jun 10 2017 20:32
You can hit load diff
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:32
really I should have just asked how to resolve my conflicts before doing anything
James
@skonk
Jun 10 2017 20:32
i adding a couple of small issues id found btw @cartag
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:32
(sorry, did I already say that?)
cartag
@cartag
Jun 10 2017 20:32
yeah, I know, but what I'm saying is that they are so numerous it won't load them
James
@skonk
Jun 10 2017 20:32
added^
cartag
@cartag
Jun 10 2017 20:32
by default view, meaning a whole fuckton of stuff changed
Daniel Mudd
@btjmp
Jun 10 2017 20:33
@FarseerVeraenthis What files did you change and mean to commit in your commit?
cartag
@cartag
Jun 10 2017 20:33
@Bitjump I fucking know that
What I am trying to convey is that if there are too many changes it won't load them in default view
And there's enough different that it has to load more, meaning it's all sorts of fucked from where it was. Are you getting that now?
Daniel Mudd
@btjmp
Jun 10 2017 20:34
I assumed you didn't, I was just trying to help - please don't flip out at me.
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:34
now I'm confused, I downloaded the whole zip again, unpacked and copied over my data location, github desktop picked up a change, I thought it was just going to update that I'd changed nothing... apparently not
cartag
@cartag
Jun 10 2017 20:34
Sorry, I'm just getting a lot of non-answers and I'm just wanting to get this back to how it was, but I don't know if this was just one big mixup or if there was a reason for it being all cocked up
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:35
it's all my fault for being a prat
I can say that as the absolute truth
unfortuantely, I don't know how to fix it
Daniel Mudd
@btjmp
Jun 10 2017 20:35
What files did you mean to commit just so we can filter out what should and shouldn't be updated?
cartag
@cartag
Jun 10 2017 20:35
I had the repo downloaded this morning. I can resync any that you didn't intend to change
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:36
I downloaded, then re-committed within about 5 minutes, without changing anything
although, it probably updated the "date last modified" or somthing
I don't know why github wanted me to re-commit everything
cartag
@cartag
Jun 10 2017 20:37
That wouldn't account for all the additions and deletions in other files though
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:37
but between downloading, unpacking, and re-committing I didn't change anything
cartag
@cartag
Jun 10 2017 20:38
1592 afdditions and 589 deletions in CSM
The only update since my last sync was your commit
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:38
I didn't do any of those...
cartag
@cartag
Jun 10 2017 20:38
Which file did you intend on replacing? I can reset progress to earlier today
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:39
I'd suggest rolling back my commit
cartag
@cartag
Jun 10 2017 20:39
But the fact remains that they were altered, and from your commit
BSData/wh40k@543e851
That's your commit with all the changes to files in it. Which file did you intend on updating?
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:39
I wanted to catch UssX's updates onto my local
when I tried to sync before all this there wer conflict
s
then I tried to be clever and then the world seems to have collapsed
Daniel Mudd
@btjmp
Jun 10 2017 20:40
I see why it's fucked up
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:40
so, let's say Craftworld CAT is all I've been working on
Daniel Mudd
@btjmp
Jun 10 2017 20:41
It's a merge commit for everything from c9fc039 onwards
cartag
@cartag
Jun 10 2017 20:41
You're being remarkably less than helpful. Just tell me which file(s) you were trying to work on, I'll replace the rest.
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:41
Craftworld CAT is all I've been working on
cartag
@cartag
Jun 10 2017 20:41
Or I'll just roll back everything to where it was this morning and you can go from there
Thank you.
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:42
(sorry for the grief)
(I should have tried harder to resolve the conflicts properly)
(sorry)
cartag
@cartag
Jun 10 2017 20:43
I'm reuploading any files affected by your commit to reset since I can't roll back the commit
I'm sorry for being harsh. I had to leave FLGS due to my brain starting to go downhill and it just got unleashed on you. It wasn't fair and was rude of me.
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:46
dude, it's cool, I shouldn't be such a maverick
I just want to get this shit finished, and the repo released so I can go back to working on my nice little branch
cartag
@cartag
Jun 10 2017 20:47
It's processing now
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:47
wait with baited breath
cartag
@cartag
Jun 10 2017 20:49
And now it restore my files...
it won't*
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:49
:cry:
Leanden
@Leanden
Jun 10 2017 20:54
So the reo is fucked?
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:55
(hopefully not...)
cartag
@cartag
Jun 10 2017 20:55
I keep trying to re-upload the old stuff and it's not having it
Daniel Mudd
@btjmp
Jun 10 2017 20:55
So basically what's happened is all the changes are still fine
And files are still fine
But all the commits we made between one of Simon's old commits and the new merge commit are gone and the changes themselves have been squished into a merge commit
penguin20000
@penguin20000
Jun 10 2017 20:56
O_o
cartag
@cartag
Jun 10 2017 20:56
my files aren't fine
Daniel Mudd
@btjmp
Jun 10 2017 20:56
So uploading the files won't do anything, as they're identical and the same, but because the git history has massively changed, they technically get updated
cartag
@cartag
Jun 10 2017 20:56
well, locally are
Daniel Mudd
@btjmp
Jun 10 2017 20:56
Are they incorrect?
cartag
@cartag
Jun 10 2017 20:57
on site, yes. 2,181 changes in CSM file alone between my last sync and the massive commit
Simon Porter
@FarseerVeraenthis
Jun 10 2017 20:57
so, move/copy your local somewhere, re-download, then copy and synce??
:worried:
cartag
@cartag
Jun 10 2017 20:57
I'm trying to upload directly to the site and it's not taking it
Daniel Mudd
@btjmp
Jun 10 2017 20:57
Although there's file changes that's file changes between Simon's old commit and the merge commit
Let me diff the files and see if there's any actual changes
Daniel Mudd
@btjmp
Jun 10 2017 21:03
okay so diff of BSData/wh40k@e5acb3b and BSData/wh40k@26c000f are the same
For CSM, at least
Simon Porter
@FarseerVeraenthis
Jun 10 2017 21:04
that's good, right?
Daniel Mudd
@btjmp
Jun 10 2017 21:04
Meaning your data is still safe and there's no actual file changes, it just reads as lines changed because the parent commit for that merge is BSData/wh40k@c9fc039 rather than BSData/wh40k@26c000f
cartag
@cartag
Jun 10 2017 21:05
File size between CSM on my system and CSM I just downloaded are different
fuck it, I'll find the differences eventually
Daniel Mudd
@btjmp
Jun 10 2017 21:05
could always diff it
Simon Porter
@FarseerVeraenthis
Jun 10 2017 21:06
you need to copy your local and rewrite the one you downloaded to force the sync next time you commit...
as in write over
not manually type, that would be daft
let's go with overwrite
would that work?
(is it even possible?)
James
@skonk
Jun 10 2017 21:19
Pretty mad amount of work you must have done @cartag to get all the chaos stuff into what appears to be pretty close to perfect working order in such a short time. I very much appreciate your efforts.
cartag
@cartag
Jun 10 2017 21:21
Thanks @skonk. I basically get one unit set up how it needs to be then copypasta to others. Saves time, but there are occasional hiccups. It's really handy though with models that have a wound table
btw, four new chaos uploads as of a few minutes ago with new fixes
James
@skonk
Jun 10 2017 21:21
sweet
I need to learn how to do this stuff myself; a friend of mine is developing his own tabletop game and i keep saying I'll try setting BS up to do his game's lists in; but I load up the editors and it boggles my brain a bit :)
cartag
@cartag
Jun 10 2017 21:22
The way I learned was looking at the old CSM file for 7th before I took over and finding a TON of optimization to be done
James
@skonk
Jun 10 2017 21:23
ah
cartag
@cartag
Jun 10 2017 21:23
It was atrocious. That was two years ago.
James
@skonk
Jun 10 2017 21:23
heh
cartag
@cartag
Jun 10 2017 21:23
I got to build the KDK file from the ground up, it was nice
James
@skonk
Jun 10 2017 21:25
:)
Earl Bishop
@DrTobogganMD
Jun 10 2017 21:28
So i'm not reading 200+ messages.
I have a copy of the repo from 7a CT this morning
would that help?
Daniel Mudd
@btjmp
Jun 10 2017 21:28
No, repo is fine
commits are all still there
Earl Bishop
@DrTobogganMD
Jun 10 2017 21:28
Ok
Daniel Mudd
@btjmp
Jun 10 2017 21:28
just gone from file history due to the parent of the merge being weird
Daniel Mudd
@btjmp
Jun 10 2017 21:40
Or that's my interpretation of what's happened, at least
Leanden
@Leanden
Jun 10 2017 21:50
Are there any catalogues that need to be worked on? Im pretty good with the BS editor :£
flakpanda
@flakpanda
Jun 10 2017 21:52
@/all ^
Simon Porter
@FarseerVeraenthis
Jun 10 2017 21:56
well that was exciting...
anyway, I think the Craftworld CAT is now complete
so, QA away
to complete the discussion from earlier, if you work directly on the branch/master, you commit directly to it, hitting "sync" in github does a pull/push from local. So I don't know what caused the conflicts between the version of Craftworlds that was on the sever and the version I had locally. I know USSX made some changes, but surely he should have had to resolve any conflicts before his pull request was accepted... anyway, it's done, I'm up early tomorow, I'll respond to bugs then :smile: :+1:
Owlsbane
@Owlsbane
Jun 10 2017 22:08
@FarseerVeraenthis I'll try and check the Craftworld cat beginning tomorrow, hope to be able to finish that on monday.
Jon Kissinger
@alphalas
Jun 10 2017 22:14
Inq needs abilities written up
McChew
@McChew
Jun 10 2017 22:15
Adding a heavy weapon model into a unit, how should that be done?
I've seen some case where you check a box and it add another model, another time I've seen the heavy weapon options on all the models in the unit
James
@skonk
Jun 10 2017 22:26
@cartag out of interest, whats the process for running Berserkers and Noise Marines as troops now ?
cartag
@cartag
Jun 10 2017 22:32
Currently... uh... add a detachment, add WE legion for Zerkers, add another and make it EC? that should make them troops in their respective lists
TBH I have no idea how else to implement it.
James
@skonk
Jun 10 2017 22:33
I didn't think we had a Legion switch in there now though?
cartag
@cartag
Jun 10 2017 22:34
there is supposed to be....
James
@skonk
Jun 10 2017 22:34
oh
cartag
@cartag
Jun 10 2017 22:34
fml
James
@skonk
Jun 10 2017 22:34
I thought you took it out on purpose
cartag
@cartag
Jun 10 2017 22:34
no, I took TS and DG out of it on purpose
James
@skonk
Jun 10 2017 22:34
ah
cartag
@cartag
Jun 10 2017 22:34
wtf....
James
@skonk
Jun 10 2017 22:35
i think at that point it went entirely
Jon Kissinger
@alphalas
Jun 10 2017 22:36
@McChew I think the suggested way is how it's done in aMin with the sisters squad
What are you trying to do?
cartag
@cartag
Jun 10 2017 22:38
We currently have nothing in GST for displaying "No Org Slot" or equivalent on rosters. I'm adding it as an entry in forces
McChew
@McChew
Jun 10 2017 22:38
@alphalas Deathwing Terminators
James
@skonk
Jun 10 2017 22:40
ah
McChew
@McChew
Jun 10 2017 22:41
on top of a heavy weapon option, each terminator has the option for a power or chainfist
not sure how to implement that
cartag
@cartag
Jun 10 2017 22:57
"No Force Org Slot" is now added to all detachments
To be used with stuff like selecting Legion, not for actual units
So now to answer your previous question @skonk, you add Legion under No Force Org Slot and select from the choices :)
James
@skonk
Jun 10 2017 23:00
:)
i shall give it a test
that works :)
cartag
@cartag
Jun 10 2017 23:02
Kharn just came in the mail :D
James
@skonk
Jun 10 2017 23:02
ah nice
i have him, not painted him as of yet tho
but i could say the same for 99% of my models
and i own a lot of them
cartag
@cartag
Jun 10 2017 23:03
This is my.... third? Kharn
One metal, one failcast, and now the new sculpt
James
@skonk
Jun 10 2017 23:03
i never got the older versions
cartag
@cartag
Jun 10 2017 23:03
oh, and one HH character series
James
@skonk
Jun 10 2017 23:04
i have the old versions of every other hq though :)
cartag
@cartag
Jun 10 2017 23:04
I'm a Khorne player through and through, I think the only other one I have is Abaddon
James
@skonk
Jun 10 2017 23:04
I just like having the HQ's on the off chance i want to use them
ive never played most of them
i did the same with my Tau and Necrons
ShadowsofVanity
@ShadowsofVanity_twitter
Jun 10 2017 23:06
HQ are really strong now, with reroll bonanzas and such
Jon Kissinger
@alphalas
Jun 10 2017 23:06
I just finally picked up a triumverate of imperium - i couldn't justify not getting it any more lol
cartag
@cartag
Jun 10 2017 23:06
in a game I played a few days ago, Kharn took a Heldrake out of the sky
Jon Kissinger
@alphalas
Jun 10 2017 23:06
NICE!
James
@skonk
Jun 10 2017 23:08
:)
Jon Kissinger
@alphalas
Jun 10 2017 23:08
I converted up my greyfax to be able to be a Knight-Centura for my SoS
James
@skonk
Jun 10 2017 23:08
looks good
Jon Kissinger
@alphalas
Jun 10 2017 23:09
But magnetized so she can still double-duty as herself with the condemnor boltgun
Might have to have a friend sculpt a fur thing onto her to cover her backpack mount
James
@skonk
Jun 10 2017 23:14
:)
cartag
@cartag
Jun 10 2017 23:17
I love this sculpt, Kharn is a whirling dervish of murder
James
@skonk
Jun 10 2017 23:17
yeh he's brill
Joshua137
@Joshua137
Jun 10 2017 23:58
How can I point BS to this branch of the repository?
penguin20000
@penguin20000
Jun 10 2017 23:59
You need to download the files manually and import them