|  | 7a102d8a32 | resolve conflict straw resolve conflict darkage:straw and farming:straw Use darkage:straw if not mod farming else use farming:straw | 2015-03-03 21:18:02 +01:00 |  | 
			
				
					|  | de4a8b2409 | Rebalanced wood's recipe in darkage cause conflict craft | 2015-02-28 21:25:59 +01:00 |  | 
			
				
					| 
							
							
								 Ombridride | 887473124e | Merge server to github | 2014-12-11 18:53:00 +01:00 |  | 
			
				
					| 
							
							
								 Ombridride | 2e895a7790 | Merge server with github repository Pas mal de changement n’ont pas été pushé sur le github du serveur,
voici l’occasion de faire une bonne synchronisation :) | 2014-11-16 22:23:16 +01:00 |  | 
			
				
					| 
							
							
								 LeMagnesium | 259cbc16b5 | Removing shapeless type in crafts - Removing the shapeless type of the crafts recipes for :
	- darkage:ors_brick
	- darkage:slate_brick
	- darkage:basalt_brick | 2014-11-11 02:01:00 +01:00 |  | 
			
				
					| 
							
							
								 LeMagnesium | 811a60e63f | Adding craft recipes for bricks - Adding craft recipes for :
	darkage:ors 4 ==> darkage:ors_brick 4
	darkage:slate 4 ==> darkage:slate_brick 4
	darkage:basalt 4 ==> darkage:basalt_brick 4 | 2014-11-10 22:40:04 +01:00 |  | 
			
				
					| 
							
							
								 Ombridride | 232b274c55 | initial commit subgame + mods | 2014-10-28 18:01:32 +01:00 |  |