//------------------------------// // commits/master/readme.txt/chrono/1 // Story: Merge Request // by FanOfMostEverything //------------------------------// sparklelabs / thaumics History for thaumics / readme.txt -o- Commits on April 24, 2016 Porting from high_energy_physics tsparkle committed 7 weeks ago Not showing 82 other changed files with 2,094 additions. - 1 + This repository is for all scripts, analysis models, hypotheses, experiments, and other assorted research pertaining to the exotic energy I have been studying for the last several months. Given that said energy is literal magic from a world full of unicorns and other fantastic creatures out of mythology, it didn't seem right to keep it in the same category as the particle accelerator models and the data from the Uranium Incident. Which is now only the second most regrettable moment of my life. - 2 + - 3 + Yes, really. Magic. Canterlot High has at least six students who possess actual, honest-to-goodness, insufficiently analyzed magic. And even after I tried to tear the world apart to get to another one, they want to be my friends. - 4 + - 5 + That, more than anything, shows me how much I have to learn. But social_sciences is already its own repository, if a rarely used one. This is for the phenomena not of this world, not the even more terrifying prospect of frequent social interaction with my age cohort. More professional tone; this isn't a journal tsparkle committed 7 weeks ago - 1 + This repository is for all scripts, analysis models, hypotheses, experiments, and other assorted research pertaining to the exotic energy I have been studying for the last several months. Specifically, Equestrian magic. 1 - - This repository is for all scripts, analysis models, hypotheses, experiments, and other assorted research pertaining to the exotic energy I have been studying for the last several months. Given that said energy is literal magic from a world full of unicorns and other fantastic creatures out of mythology, it didn't seem right to keep it in the same category as the particle accelerator models and the data from the Uranium Incident. Which is now only the second most regrettable moment of my life. 2 2 | - 3 + Given that that is the term used by native researchers, I will overlook any unscientific, reflexive rejections to it. Still, I have named the repository as a reminder that the rest of the scientific community may not be so open-minded. It will take a lot of research to legitimize this field in the eyes of others. As stated above, such is the purpose of this repository. 3 - - Yes, really. Magic. Canterlot High has at least six students who possess actual, honest-to-goodness, insufficiently analyzed magic. And even after I tried to tear the world apart to get to another one, they want to be my friends. 4 - - 5 - - That, more than anything, shows me how much I have to learn. But social_sciences is already its own repository, if a rarely used one. This one is for the phenomena not of this world, not the even more terrifying prospect of frequent social interaction with my age cohort. -o- Commits on April 27, 2016 Silly Twily msparkle committed 6 weeks ago - 4 + - 5 + All this work and you don't mention me even once? I'm hurt. Revert "Silly Twily" tsparkle committed 6 weeks ago 4 - - 5 - - All this work and you don't mention me even once? I'm hurt. -o- Commits on April 28, 2016 Revert "Revert "Silly Twily"" That's even more hurtful. msparkle committed 6 weeks ago - 4 + - 5 + All this work and you don't mention me even once? I'm hurt. Revert "Revert "Revert "Silly Twily""" tsparkle committed 6 weeks ago 4 - - 5 - - All this work and you don't mention me even once? I'm hurt. -o- Commits on April 29, 2016 You're being a child. msparkle committed 6 weeks ago - 4 + - 5 + Look, Twily, do you want to have a virtual slapfight over two lines of text for the rest of your life, or do you want to actually resolve this problem? I'd like to get something productive done here. Why? tsparkle committed 6 weeks ago - 6 + - 7 + Even if I trusted you, why are you communicating with me through bit commits of all things? -o- Commits on April 30, 2016 If you must know... msparkle committed 6 weeks ago - 8 + - 9 + Based on past experience, you can ignore emails, text messages, sticky notes on the computer... I didn't even bother with social media. We both know you only made a MyStable account to humor Rarity and Pinkie Pie. The only ways I can communicate with you that you can't ignore are dreams and messing with the sanctity of a readme file that you don't plan on letting anyone else read. ... Fine tsparkle committed 6 weeks ago - 10 + - 11 + I can make something in experimental_logs. But I am still cleaning up this file. Showing 1-10 of 12 commits 1|2