conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
using Common.Logging;
=======
using Moq;
>>>>>>>
using Common.Logging;
using Moq;
<<<<<<<
using Moq;
=======
>>>>>>> |
<<<<<<<
mock.Setup(a => a.GetAssemblyPaths(It.IsAny<string>(), false)).Returns(new[] { "foo.dll" });
=======
mock.Setup(a => a.GetAssemblyPaths(It.IsAny<string>())).Returns(new[] { "/foo.dll" });
>>>>>>>
mock.Setup(a => a.GetAssemblyPaths(It.IsAny<string>(), false)).Re... |
<<<<<<<
var engine = new ScriptEngine();
engine.AddReference("System");
engine.AddReference("System.Core");
var bin = Path.Combine(_fileSystem.GetWorkingDirectory(script), "bin");
engine.BaseDirectory = bin;
=======
_scriptEngine.AddReference("Sy... |
<<<<<<<
[ArgDescription("Flag which defines the log level used. Possible values:" + ValidLogLevels)]
[ArgShortcut("log")]
[DefaultValue("off")]
public string LogLevel
{
get
{
return _logLevel;
}
set
{
... |
<<<<<<<
DelimiterType DefaultSeparator { get; set; }
=======
bool TraceDirectQuery { get; set; }
>>>>>>>
DelimiterType DefaultSeparator { get; set; }
bool TraceDirectQuery { get; set; } |
<<<<<<<
=======
command = "INSERT INTO general (key, value) VALUES (\"PathPrefix\", @prefix)";
Dictionary<string, object> parameters = new Dictionary<string, object>();
parameters.Add("prefix", ConfigManager.CurrentConfig.FoldersPath);
... |
<<<<<<<
}
=======
}
syncFull = CrawlSync(remoteFolder, localFolder);
>>>>>>>
}
<<<<<<<
Logger.Info("Invoke a full crawl sync");
syncFull = CrawlSync(remoteFolder, localFolder);
return;
... |
<<<<<<<
// The file has been recently created locally (not synced from server).
item = SyncItemFactory.CreateFromLocalPath(filePath, repoInfo);
=======
item = SyncItemFactory.CreateFromLocalPath(filePath, false, repoInfo, database);
>>>>>>>
... |
<<<<<<<
Logger.Info(String.Format("Conflict with file: {0}", syncItem.RemoteFileName));
// Rename local file with a conflict suffix.
string conflictFilename = Utils.CreateConflictFilename(filepath, repoinfo.User);
... |
<<<<<<<
using System.ComponentModel;
=======
using CmisSync.Lib.Credentials;
>>>>>>>
using System.ComponentModel;
using CmisSync.Lib.Credentials;
<<<<<<<
Logger.Fatal("Could not create repository.", e);
Program.Controller.ShowAlert(Properties_Resources.Error, String.Format(Properties... |
<<<<<<<
string message;
while ((message = this.listener.NextQueueDownMessage (Identifier)) != null) {
if (!message.Equals (CurrentRevision))
SyncDownBase ();
}
=======
>>>>>>> |
<<<<<<<
public CmisRepo(RepoInfo repoInfo, IActivityListener activityListener)
=======
/// <summary>
/// Constructor.
/// </summary>
public CmisRepo(RepoInfo repoInfo, ActivityListener activityListener)
>>>>>>>
/// <summary>
/// Constructor.
/// </summa... |
<<<<<<<
public readonly string WebsiteLinkAddress = "https://github.com/OpenDataSpace/DataSpaceSync";
/// <summary>
/// URL to the AUTHORS file
/// </summary>
public readonly string CreditsLinkAddress = "https://raw.github.com/OpenDataSpace/CmisSync/master/legal/AUTH... |
<<<<<<<
this.synchronizedFolder = new SynchronizedFolder(repoInfo, this, activityListener);
=======
this.synchronizedFolder = new SynchronizedFolder(repoInfo, activityListener, this);
this.Watcher.ChangeEvent += OnFileActivity;
this.Watcher.EnableEvent = true;
>>>>>>>
... |
<<<<<<<
return Path.Combine(HomePath, "CmisSync");
=======
return Path.Combine(HomePath, "DataSpace");
>>>>>>>
return Path.Combine(HomePath, "CmisSync");
<<<<<<<
PollInterval = repoInfo.PollInterval,
LastSuccessedSync = repoInfo.LastSuc... |
<<<<<<<
// If there was previously a folder with this name, it means that
// the user has deleted it voluntarily, so delete it from server too.
activityListener.ActivityStarted();
// Delete ... |
<<<<<<<
using System.Reflection;
#if __MonoCS__
//using Mono.Unix.Native;
#endif
=======
//#if __MonoCS__
//using Mono.Unix.Native;
//#endif
>>>>>>>
using System.Reflection;
//#if __MonoCS__
//using Mono.Unix.Native;
//#endif
<<<<<<<
#if __MonoCS__
// writeAllow = (0 == Syscall.access(path, AccessMo... |
<<<<<<<
public IList<ADOTabularRelationship> Relationships { get; private set; }
=======
public ADOTabularObjectType ObjectType => ADOTabularObjectType.Table;
>>>>>>>
public IList<ADOTabularRelationship> Relationships { get; private set; }
public ADOTabularObjectType ObjectType =>... |
<<<<<<<
Util.Utils.DeleteFiles(Thumbs.TVRecorded, String.Format(@"*{0}", Util.Utils.GetThumbExtension()));
Util.Utils.DeleteFiles(Thumbs.Videos, String.Format(@"*{0}", Util.Utils.GetThumbExtension()), true);
=======
Util.Utils.DeleteFiles(Thumbs.Videos, String.Format(@"*{0}", Util.Utils.GetThumbExte... |
<<<<<<<
using DaxStudio.Controls.PropertyGrid;
using System.Reflection;
using System.Drawing;
=======
using System.Threading.Tasks;
>>>>>>>
using DaxStudio.Controls.PropertyGrid;
using System.Reflection;
using System.Drawing;
using System.Threading.Tasks;
<<<<<<<
private bool _excludeHeadersWhenCopyingResul... |
<<<<<<<
public Task OutputResultsAsync(IQueryRunner runner, IQueryTextProvider textProvider)
=======
public async Task OutputResultsAsync(IQueryRunner runner)
>>>>>>>
public async Task OutputResultsAsync(IQueryRunner runner, IQueryTextProvider textProvider)
<<<<<<<
va... |
<<<<<<<
using Windows.UI.Xaml.Media;
using System.Collections.Generic;
=======
using System.Runtime.CompilerServices;
using Windows.System;
using Windows.UI.Xaml.Input;
>>>>>>>
using Windows.UI.Xaml.Media;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
using Windows.System;
using Windows.UI... |
<<<<<<<
List<GUIListItem> items = new List<GUIListItem>();
foreach (Share share in m_shares)
{
bool pathOnline = false;
GUIListItem item = new GUIListItem();
item.Label = share.Name;
item.Path = share.Path;
if (Utils.IsRemovable(item.Path) && Directory.Exists(it... |
<<<<<<<
=======
#region radio methods
/// <summary>
/// Tune to a radio station. After runing call GetRadioPlaylist to get the track listing
/// </summary>
/// <param name="stationURL"></param>
public static bool TuneRadio(string stationURL)
{
var parms = new Dictionary<string, st... |
<<<<<<<
bool Vmr9Enabled = xmlreader.GetValueAsBool("musicvideo", "useVMR9", true);
=======
int streamPlayer = xmlreader.GetValueAsInt("audioscrobbler", "streamplayertype", 0);
bool Vmr9Enabled = xmlreader.GetValueAsBool("musicvideo", "useVMR9", true);
bool InternalBDPlayer = x... |
<<<<<<<
using System.Xml;
=======
using MediaPortal.DeployTool.Sections;
>>>>>>>
using MediaPortal.DeployTool.Sections;
using System.Xml; |
<<<<<<<
ActiveDocument.IsQueryRunning = false;
});
}
else if (IsSQLExport)
{
Task.Run(() =>
=======
}
else if (IsSQLExport)
>>>>>>>
}
... |
<<<<<<<
// In the list must be at least 2 files so we check stackable movie for resume
// (which file have a stop time)
=======
//Do NOT add OnItemSelected event handler here, because its still there...
facadeLayout.Add(item);
}
}
else
{
... |
<<<<<<<
GUIGraphicsContext.form.Invoke(new PlaybackChangedDelegate(DoOnStarted), new object[] {type, filename});
UpdateSimilarTracks(filename);
=======
GUIGraphicsContext.form.BeginInvoke(new PlaybackChangedDelegate(DoOnStarted), new object[] {type, filename});
>>>>>>>
GUIGraphicsContext.form... |
<<<<<<<
=======
using System.Linq;
using System.Diagnostics;
>>>>>>>
using System.Diagnostics; |
<<<<<<<
GUI_MSG_SKIN_CHANGED = 101,
=======
GUI_MSG_VIDEOINFO_REFRESH = 101,
>>>>>>>
GUI_MSG_VIDEOINFO_REFRESH = 101,
GUI_MSG_SKIN_CHANGED = 101, |
<<<<<<<
// TODO - if theme is dark increase brightness of syntax highlights
//_editor.ChangeColorBrightness(1.25);
_editor.SetSyntaxHighlightColorTheme(_options.Theme);
=======
>>>>>>>
// TODO - if theme is dark increase brightness of syntax highlights
... |
<<<<<<<
// Handle this message here needed for madVR
if (Windowed || !_ignoreFullscreenResolutionChanges)
{
OnDisplayChange(ref msg);
PluginManager.WndProc(ref msg);
}
// Restore bounds from the currentScreen value (to restore original startup M... |
<<<<<<<
{
Log.Debug("VideodatabaseSqllite AddFile:{0}", strFileName);
// GetMediaInfoThread and starting to play a file can run simultaneously and both of them use addfile method
lock (typeof(VideoDatabaseSqlLite))
{
if (m_db == null)
{
return -1;
}
... |
<<<<<<<
//Refreshes the VM counter in the status bar
private void VMCountRefresh()
{
int runningVMs = 0;
int pausedVMs = 0;
int waitingVMs = 0;
int stoppedVMs = 0;
foreach(ListViewItem lvi in lstVMs.Items)
{
... |
<<<<<<<
=======
using System.Web;
>>>>>>>
<<<<<<<
=======
using TeleSharp.TL.Channels;
using TeleSharp.TL.Contacts;
using TeleSharp.TL.Messages;
using TeleSharp.TL.Upload;
>>>>>>>
using TeleSharp.TL.Upload;
<<<<<<<
=======
using TLSharp.Core.Auth;
using TLSharp.Core.MTProto;
using TLSharp.Core.Network;
usin... |
<<<<<<<
//Application.Current.LoadRibbonTheme();
=======
_inputBindings = new InputBindings(_window);
_inputBindings.RegisterCommands(GetInputBindingCommands());
}
private IEnumerable<InputBindingCommand> GetInputBindingCommands()
{
yield ret... |
<<<<<<<
{
const int DefaultMaxNrOfPages = 10;
const string DefaultPageRouteValueKey = "page";
public RouteValueDictionary RouteValues { get; internal set; }
=======
{
public static class DefaultDefaults
{
public const int MaxNrOfPages = 10;
public const string DisplayT... |
<<<<<<<
public static int Run(string? project, string? workspace, string? msbuildPath, string? tfm, bool forceWebConversion, bool allowPreviews, bool diffOnly, bool noBackup, bool keepCurrentTfms)
=======
public static int Run(string? project, string? workspace, string? msbuildPath, string? tfm, bool ... |
<<<<<<<
success = matches[0].Value.TryParseFloat(out from);
to = from;
}
else if (matches.Count > 2)
{
Log.Warn($"Too many floats in property {cell.InnerHtml}");
continue;
}
... |
<<<<<<<
using DaxStudio.UI.JsonConverters;
using DaxStudio.UI.Utils;
=======
using System.Windows.Media;
>>>>>>>
using DaxStudio.UI.JsonConverters;
using DaxStudio.UI.Utils;
using System.Windows.Media; |
<<<<<<<
skillNode.passivePointsGranted,
new NodePosition(skillNode.Position.X, skillNode.Position.Y),
skillNode.attributes);
=======
skillNode.PassivePointsGranted,
skillNode.StatDefinitions);
>>>>>>>
skillNode.PassivePo... |
<<<<<<<
public List<string[]> CustomGroups { get; set; }
=======
public AscendantAdditionalStart AscendantAdditionalStart { get; set; }
>>>>>>>
public List<string[]> CustomGroups { get; set; }
public AscendantAdditionalStart AscendantAdditionalStart { get; set; }
<<<<<<<
... |
<<<<<<<
}
private void ScreenShot_Click(object sender, RoutedEventArgs e)
{
const int maxsize = 3000;
Rect2D contentBounds = _tree.picActiveLinks.ContentBounds;
contentBounds *= 1.2;
double aspect = contentBounds.Width / contentBounds.Height;
... |
<<<<<<<
=======
using System.Text.RegularExpressions;
using Raven.Json.Linq;
>>>>>>>
using System.Text.RegularExpressions;
<<<<<<<
using Newtonsoft.Json.Linq;
=======
using POESKillTree.Localization;
>>>>>>>
using POESKillTree.Localization;
using Newtonsoft.Json.Linq;
<<<<<<<
string url = ((JObj... |
<<<<<<<
Hand = item.Class == ItemClass.MainHand ? WeaponHand.Main : WeaponHand.Off;
=======
>>>>>>>
<<<<<<<
MainHand = new Weapon(Items.Find(i => i.Class == ItemClass.MainHand));
OffHand = new Weapon(Items.Find(i => i.Class == ItemClass.OffHand));
=======
Ma... |
<<<<<<<
{
"for each blinded enemy hit by this weapon",
(And(ModifierSourceIs(ItemSlot.MainHand), MainHandAttack, Hit.On, Buff.Blind.IsOn(Enemy)),
And(ModifierSourceIs(ItemSlot.OffHand), OffHandAttack, Hit.On, Buff.Blind.IsOn(Enemy)))
... |
<<<<<<<
using Ionic.Zip;
=======
using Microsoft.Win32;
using Raven.Json.Linq;
>>>>>>>
using Microsoft.Win32;
<<<<<<<
using Newtonsoft.Json.Linq;
=======
using POESKillTree.Utils;
>>>>>>>
using Newtonsoft.Json.Linq;
using POESKillTree.Utils;
<<<<<<<
// Find PoESkillTree ZIP package.
... |
<<<<<<<
using System.Diagnostics;
=======
using POESKillTree.Utils;
>>>>>>>
using System.Diagnostics;
using POESKillTree.Utils;
<<<<<<<
#if DEBUG
Stopwatch stopwatch = new Stopwatch();
stopwatch.Start();
#endif
steinerSolver.InitializeSolver(targetNodes);
#if DEBUG
st... |
<<<<<<<
using Sidekick.Core.DependencyInjection.Services;
using Sidekick.Core.Loggers;
=======
using Sidekick.Business.Loggers;
>>>>>>>
using Sidekick.Core.Loggers; |
<<<<<<<
public event Func<Task> OnCloseWindow;
public event Func<Task> OnPriceCheck;
public event Func<Task> OnHideout;
public event Func<Task> OnItemWiki;
public event Func<Task> OnFindItems;
public event Func<Task> OnLeaveParty;
public event Func<Task> OnOpenSea... |
<<<<<<<
pattern = increasedPattern.Replace(pattern, $"(?:{languageProvider.Language.ModifierReduced}|{languageProvider.Language.ModifierIncreased})");
=======
pattern = hashPattern.Replace(pattern, "([-+\\d,\\.]+)");
>>>>>>>
pattern = increasedPattern.Repla... |
<<<<<<<
=======
using System;
using Sidekick.Helpers.POEPriceInfoAPI;
>>>>>>>
using Sidekick.Helpers.POEPriceInfoAPI;
<<<<<<<
menuItem.Click += (s, e) => { TradeClient.SelectedLeague = league; };
=======
menuItem.Click += (s, e) => { TradeClient.SelectedLeague = l; PriceInfoClient... |
<<<<<<<
services.AddSingleton<OverlayController>();
services.AddSingleton<OverlayWindow>();
services.AddSingleton<AdvancedSearchController>();
=======
>>>>>>>
services.AddSingleton<AdvancedSearchController>(); |
<<<<<<<
event Func<Task> OnCloseWindow;
event Func<Task> OnPriceCheck;
event Func<Task> OnHideout;
event Func<Task> OnItemWiki;
event Func<Task> OnFindItems;
event Func<Task> OnLeaveParty;
event Func<Task> OnOpenSearch;
event Func<Task> OnOpenLeagueOvervie... |
<<<<<<<
=======
using Sidekick.Helpers.POETradeAPI.Models;
using Sidekick.Helpers.Localization;
using Sidekick.Helpers.POETradeAPI;
using Sidekick.Helpers.POEPriceInfoAPI;
>>>>>>>
using Sidekick.Helpers.POEPriceInfoAPI;
<<<<<<<
if (hasNote)
{
((Equippa... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
=======
using Sidekick.Windows.PricePrediction;
>>>>>>>
using Sidekick.Windows.PricePrediction;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Ta... |
<<<<<<<
public event Func<int, int, Task> OnMouseClick;
public event Func<Task<bool>> OnAdvancedSearch;
=======
>>>>>>>
public event Func<Task<bool>> OnAdvancedSearch; |
<<<<<<<
public List<League> Leagues { get; private set; }
public event Action LeaguesUpdated;
public LeagueService(IPoeApiService poeApiService,
=======
public LeagueService(IPoeApiClient poeApiClient,
>>>>>>>
public List<League> Leagues { get; private set; }
public... |
<<<<<<<
public string DescriptionMapTier => "지도 등급: ";
public string DescriptionItemQuantity => "아이템 수량: ";
public string DescriptionItemRarity => "아이템 희귀도: ";
public string DescriptionMonsterPackSize => "몬스터 무리 규모: ";
public string PrefixBlighted => "역병";
=======
publ... |
<<<<<<<
string DescriptionMapTier { get; }
string DescriptionItemQuantity { get; }
string DescriptionItemRarity { get; }
string DescriptionMonsterPackSize { get; }
=======
string DescriptionExperience { get; }
>>>>>>>
string DescriptionMapTier { get; }
string ... |
<<<<<<<
using Sidekick.Core.DependencyInjection.Services;
using Sidekick.Core.Initialization;
using Sidekick.Core.Loggers;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
=======
using Sidekick.Core.Se... |
<<<<<<<
public string Key_AdvancedSearch { get; set; }
=======
public string Key_Exit { get; set; }
public string Key_Stash_Left { get; set; }
public string Key_Stash_Right { get; set; }
>>>>>>>
public string Key_AdvancedSearch { get; set; }
public string Key_Exit... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Linq;
=======
using Microsoft.Extensions.Configuration;
>>>>>>>
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.Configuration; |
<<<<<<<
=======
public static int Sum(int n)
{
return (n * n + n) / 2;
}
}
>>>>>>>
public static int Sum(int n)
{
return (n * n + n) / 2;
} |
<<<<<<<
using Vocaluxe.Base;
using VocaluxeLib;
using VocaluxeLib.Songs;
=======
using VocaluxeLib.Menu;
using VocaluxeLib.Menu.SongMenu;
>>>>>>>
using VocaluxeLib;
using VocaluxeLib.Songs; |
<<<<<<<
List<string> folders = new List<string> {FolderCover, FolderFonts, Path.Combine(DataPath,FolderScreenshots), FolderBackgroundMusic, FolderSounds, Path.Combine(DataPath,FolderPlaylists)};
folders.AddRange(FoldersProfiles);
=======
var folders = new List<string> {FolderCover,... |
<<<<<<<
var settings = new XmlWriterSettings {Indent = true, Encoding = Encoding.UTF8, ConformanceLevel = ConformanceLevel.Document};
=======
>>>>>>> |
<<<<<<<
using VocaluxeLib;
=======
using VocaluxeLib.Draw;
using VocaluxeLib.Menu;
>>>>>>>
using VocaluxeLib;
using VocaluxeLib.Draw;
using VocaluxeLib.Menu; |
<<<<<<<
using Vocaluxe.Base.Font;
using Vocaluxe.Base.Server;
=======
using Vocaluxe.Base.Fonts;
>>>>>>>
using Vocaluxe.Base.Fonts;
using Vocaluxe.Base.Server; |
<<<<<<<
private System.Timers.Timer _TimerShortInfoText;
=======
private static int _StaticSelectedSongID;
private static void setStaticSelectedSongID(int songID)
{
_StaticSelectedSongID = songID;
}
public static int getSelectedSongID()
{
... |
<<<<<<<
using VocaluxeLib;
=======
using VocaluxeLib.Draw;
using VocaluxeLib.Menu;
>>>>>>>
using VocaluxeLib;
using VocaluxeLib.Draw;
using VocaluxeLib.Menu;
<<<<<<<
if (false && Char.IsLetterOrDigit(chr))
=======
// ReSharper disable HeuristicUnreachableCode
... |
<<<<<<<
List<string> files = new List<string>();
files.AddRange(CHelper.ListFiles(Path.Combine(CSettings.DataPath,CSettings.FolderPlaylists), "*.upl", true, true));
=======
var files = new List<string>();
files.AddRange(CHelper.ListFiles(CSettings.FolderPlaylists, "*.up... |
<<<<<<<
using VocaluxeLib;
using VocaluxeLib.Game;
using VocaluxeLib.Profile;
=======
using VocaluxeLib.Draw;
using VocaluxeLib.Menu;
>>>>>>>
using VocaluxeLib;
using VocaluxeLib.Game;
using VocaluxeLib.Profile;
using VocaluxeLib.Draw;
using VocaluxeLib.Menu;
<<<<<<<
_Queue.Enqueue(change);
=======... |
<<<<<<<
private List<CPlaylist> _Playlists;
=======
private List<CEqualizer> _Equalizers;
>>>>>>>
private List<CEqualizer> _Equalizers;
private List<CPlaylist> _Playlists;
<<<<<<<
private Hashtable _htPlaylists;
=======
private Hashtable _htEqualizers;
>>>>>>>
... |
<<<<<<<
using VocaluxeLib;
=======
using VocaluxeLib.Draw;
>>>>>>>
using VocaluxeLib;
using VocaluxeLib.Draw; |
<<<<<<<
for (int p = 0; p < CGame.NumPlayers; p++)
_ProgressBars[_ProgressBarsRating[p, CGame.NumPlayers - 1]].Reset();
_SetDuetLyricsVisibility(song.IsDuet);
=======
>>>>>>>
for (int p = 0; p < CGame.NumPlayers; p++)
_ProgressBars[_ProgressBarsRat... |
<<<<<<<
CBase.PreviewPlayer.Stop();
=======
if (_PreviewSongStream >= 0)
CBase.Sound.FadeAndClose(_PreviewSongStream, 0f, 0.75f);
_PreviewSongStream = -1;
CBase.Video.Close(_PreviewVideoStream);
_PreviewVideoStream = -1;
CBase.... |
<<<<<<<
case Keys.W:
if (CWebcam.GetDevices().Length > 0)
{
_Webcam = !_Webcam;
if (_Webcam)
CWebcam.Start();
else
... |
<<<<<<<
if (_UsedProfiles.Contains(profile.ID) && !profile.UserRole.HasFlag(EUserRole.TR_USERROLE_NORMAL))
visible = false;
=======
//Show profile only if active
for (int p = 0; p < CBase.Game.GetNumPlayer(); p++)
... |
<<<<<<<
writer.WriteComment("Background Music Source");
writer.WriteElementString("BackgroundMusicSource", Enum.GetName(typeof(EBackgroundMusicSource), BackgroundMusicSource));
=======
writer.WriteComment("Background Music use start-tag of songs");
write... |
<<<<<<<
using System;
using System.Linq;
=======
>>>>>>>
using System;
using System.Linq;
<<<<<<<
Guid id = Guid.Empty;
=======
>>>>>>>
Guid id = Guid.Empty; |
<<<<<<<
_Screens.Add(new CScreenTest());
_Screens.Add(new CScreenLoad());
_Screens.Add(new CScreenMain());
_Screens.Add(new CScreenSong());
_Screens.Add(new CScreenOptions());
_Screens.Add(new CScreenSing());
_Screens.Add(new CScreenPro... |
<<<<<<<
width = Translation.getMenuWidth();
height = LoadingExtension.IsPathManagerCompatible ? 310 : 230;
=======
width = 250;
height = LoadingExtension.IsPathManagerCompatible ? 350 : 270;
>>>>>>>
width = Translation.getMenuWidth();
height = LoadingExtension.IsPathManagerCompatible ? 350 : 270;
... |
<<<<<<<
using VocaluxeLib;
=======
using VocaluxeLib.Draw;
>>>>>>>
using VocaluxeLib;
using VocaluxeLib.Draw; |
<<<<<<<
LoadSmallCover();
=======
if (!_NotesLoaded)
this.ReadNotes();
if (this.CoverFileName != String.Empty)
{
if (!CBase.DataBase.GetCover(Path.Combine(this.Folder, this.CoverFileName), ... |
<<<<<<<
using VocaluxeLib;
using VocaluxeLib.Songs;
=======
using VocaluxeLib.Draw;
using VocaluxeLib.Menu;
using VocaluxeLib.Menu.SongMenu;
>>>>>>>
using VocaluxeLib;
using VocaluxeLib.Songs;
using VocaluxeLib.Draw;
using VocaluxeLib.Menu;
using VocaluxeLib.Menu.SongMenu; |
<<<<<<<
using VocaluxeLib;
=======
using VocaluxeLib.Draw;
>>>>>>>
using VocaluxeLib;
using VocaluxeLib.Draw; |
<<<<<<<
using VocaluxeLib;
=======
using VocaluxeLib.Draw;
>>>>>>>
using VocaluxeLib;
using VocaluxeLib.Draw; |
<<<<<<<
using VocaluxeLib;
=======
using VocaluxeLib.Draw;
>>>>>>>
using VocaluxeLib;
using VocaluxeLib.Draw; |
<<<<<<<
using Vocaluxe.Base.Font;
using VocaluxeLib;
=======
using Vocaluxe.Base.Fonts;
>>>>>>>
using Vocaluxe.Base.Fonts;
using VocaluxeLib; |
<<<<<<<
using System;
=======
using System;
using System.Linq;
>>>>>>>
using System;
using System.Linq;
<<<<<<<
if (Offset * _Theme.Tiles.NumW + _ActualSelection < _VisibleProfiles.Count)
Selection = _VisibleProfiles[Offset * _Theme.Tiles.NumW + _ActualSelection];
=======
i... |
<<<<<<<
public void MarkAsUpdated(ref ExtSegment seg) {
=======
public void MarkAllAsUpdated() {
for (uint segmentId = 0; segmentId < NetManager.MAX_SEGMENT_COUNT; ++segmentId) {
SegmentGeometry segGeo = SegmentGeometry.Get((ushort)segmentId);
if (segGeo != null) {
MarkAsUpdated(segGeo, true);
... |
<<<<<<<
public const string guidSlowCheetahPkgString = "9eb9f150-fcc9-4db8-9e97-6aef2011017c";
public const string guidSlowCheetahCmdSetString = "eab4615a-3384-42bd-9589-e2df97a783ee";
public const string guidWebApplicationString = "{349c5851-65df-11da-9384-00065b846f21}";
=======
/// ... |
<<<<<<<
if (StaticsInitialized) return;
faceDeltas[(int)BoxFace.Back] = new GlobalVoxelOffset(0, 0, 1);
faceDeltas[(int)BoxFace.Front] = new GlobalVoxelOffset(0, 0, -1);
faceDeltas[(int)BoxFace.Left] = new GlobalVoxelOffset(-1, 0, 0);
faceDeltas[(int)BoxFace.... |
<<<<<<<
World.MakeAnnouncement("If we don't make a profit by tomorrow, our stock will crash!");
=======
World.MakeAnnouncement("We're bankrupt!",
"If we don't make a profit by tomorrow, our stock will crash!");
SoundMa... |
<<<<<<<
private LinkedList<LiquidTransfer> Transfers = new LinkedList<LiquidTransfer>();
private Mutex TransferLock = new Mutex();
public bool NeedsMinimapUpdate = true;
=======
>>>>>>>
public bool NeedsMinimapUpdate = true;
<<<<<<<
currentVoxel.WaterCell = n... |
<<<<<<<
World.ShowToolPopup += text => GuiRoot.ShowTooltip(new Point(4, -16),
new Gui.Widgets.ToolPopup
=======
World.ShowToolPopup += text => GuiRoot.ShowTooltip(new Point(GuiRoot.MousePosition.X + 4, GuiRoot.MousePosition.Y - 16),
new NewGui.To... |
<<<<<<<
DigOrders.Add(GetVoxelQuickCompare(order.Vox), order);
if (this == World.PlayerFaction)
World.DesignationDrawer.HiliteVoxel(order.Vox.Coordinate, DesignationType.Dig);
=======
DigOrders.Add(order.Vox, order);
World.DesignationDrawer.HiliteVoxel(o... |
<<<<<<<
//App.InteractionViewModel.TabStripSelectedIndex = TabStrip.SelectedIndex;
=======
Microsoft.UI.Xaml.Controls.FontIconSource icon = new Microsoft.UI.Xaml.Controls.FontIconSource();
icon.Glyph = "\xE713";
if ((tabView.SelectedItem as TabViewItem).... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.