MMMiracles 6c2731b22b conflicts are dumb tbh

2015-12-17 21:17:06 -05:00

..

admin

Merge pull request #13658 from tkdrg/jamp

2015-12-17 20:53:19 +03:00

assembly

…

awaymissions

Merge pull request #13687 from Buggy123/master

2015-12-17 20:25:25 -03:00

client

Reduce NanoUI size by hosting fonts externally

2015-12-17 10:15:13 -06:00

clothing

necklaces again

2015-12-16 20:47:00 -08:00

crafting

…

detectivework

…

emoji

…

events

Merge pull request #13582 from Incoming5643/Ill_turn_this_game_into_a_shitty_F2P_korean_MMO_yet

2015-12-13 15:04:53 -06:00

flufftext

…

food&drinks

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

games

Begin rewrite of NanoUI frontend.

2015-12-15 13:07:11 -06:00

holiday

…

holodeck

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

html_interface

Prefix everything with 'nanoui' to avoid conflicts

2015-12-15 13:12:33 -06:00

hydroponics

Merge pull request #13608 from KorPhaeron/fire_defines

2015-12-14 10:44:10 -06:00

json

Make NanoUI resistant to Topic spoofs

2015-12-15 22:37:52 -06:00

library

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

lighting

forgot a line

2015-12-16 03:29:24 -08:00

mining

Line ending apocalypse

2015-12-17 14:12:37 +13:00

mob

Merge pull request #13585 from KorPhaeron/reactive_expansion

2015-12-17 17:05:53 -06:00

nano

Re-organize NanoUI procs

2015-12-17 10:18:00 -06:00

ninja

…

paperwork

Line ending apocalypse

2015-12-17 14:12:37 +13:00

power

Fixes broken logic in light update()

2015-12-16 22:38:31 -03:00

procedural mapping

Adds two CA mapGenerators

2015-12-17 11:45:27 +01:00

projectiles

conflicts are dumb tbh

2015-12-17 21:17:06 -05:00

reagents

Merge pull request #13706 from Anonus/slipblob

2015-12-17 18:36:52 -03:00

recycling

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

research

I think I fixed this

2015-12-16 23:14:14 +02:00

security levels

…

shuttle

Line ending apocalypse

2015-12-17 14:12:37 +13:00

space transition

…

surgery

Line ending apocalypse

2015-12-17 14:12:37 +13:00

telesci

…

tooltip

…