AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 19:56:17 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,625 Commits 29 Branches 143 Tags
Commit Graph

3625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
53d385ca19 Properly converting loot and os floppies to plain floppies when wiping them (shift-rightclick) so they stack. 2014-08-21 23:40:32 +02:00
Florian Nücke
12558effe2 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-21 07:35:38 +02:00
Florian Nücke
333f0d7c11 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-21 07:35:28 +02:00
Florian Nücke
6aa0345d5d Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/Environment.scala
 2014-08-21 07:35:09 +02:00
Florian Nücke
347c023205 Fixed a derp in the fix for the broken fix for the thing. 2014-08-21 07:34:22 +02:00
Florian Nücke
dabf889ac2 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-21 01:50:33 +02:00
Florian Nücke
51a88cee79 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-21 01:49:20 +02:00
Florian Nücke
bc00fbb1cb Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-08-21 01:47:44 +02:00
Florian Nücke
4faea3b9b3 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/Environment.scala
 2014-08-21 01:45:09 +02:00
Florian Nücke
79cd490543 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-21 01:44:12 +02:00
Florian Nücke
5e20f38009 Fixed for for potential race condition fixing it the wrong way around (markChanged in envs now properly handles async calls, avoiding potentially triggering chunk loads when it shouldn't). 2014-08-21 01:43:27 +02:00
Florian Nücke
3812128b8c Updated natives, using libs with debug symbols for dev branch now. 2014-08-21 01:32:26 +02:00
Florian "Sangar" Nücke
87476dca87 Merge pull request #506 from Atuto/master 
Update robot.names
 2014-08-20 20:23:16 +02:00
Atuto
f3ee1454af Update robot.names 
Added Callister Raynes.  http://eureka.wikia.com/wiki/Callister_Raynes
 2014-08-19 19:11:59 -05:00
Atuto
7724844b5d Update robot.names 
Added Deputy ANDY from Eureka. http://eureka.wikia.com/wiki/ANDY
 2014-08-19 19:02:59 -05:00
Florian Nücke
e4e161552d Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/util/LuaStateFactory.scala
 2014-08-19 21:57:04 +02:00
Florian Nücke
c4a81a2270 Making OpenOS's init script pause before firing up the default shell to allow the init signal (and thus autorun scripts) to be processed before the shell calls term.read(). Closes #504, I guess. 2014-08-19 21:48:35 +02:00
Florian Nücke
50cd1100ff Added two more debug settings to hopefully allow debugging native lib related issues better. 2014-08-19 21:47:07 +02:00
Florian Nücke
8bd9360bb4 Merge branch 'master' of github.com:MightyPirates/OpenComponents into MC1.7 
Conflicts:
	src/main/java/li/cil/occ/OpenComponents.java
 2014-08-19 17:22:12 +02:00
Florian Nücke
42b96045db Added converter to add Mystcraft book and page specific information to item stack representations. 2014-08-19 17:19:29 +02:00
Florian Nücke
36807e0c73 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-18 23:15:20 +02:00
Florian Nücke
2b0b74fd9b Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-08-18 23:14:27 +02:00
Florian Nücke
ca8139b7ff Typo in docstring for screen.setTouchModeInverted. 2014-08-18 23:14:16 +02:00
Florian "Sangar" Nücke
5791c05540 Merge pull request #495 from magik6k/master 
Add OpenLoader Loot disk
 2014-08-18 22:54:33 +02:00
Florian "Sangar" Nücke
70a159ac6d Merge pull request #500 from ds84182/patch-1 
space space I wanna go to space
 2014-08-18 22:28:08 +02:00
Dwayne Slater
65f5806a93 sortato. SPAAAAAAAAAAAAAAAAAAAAAAACE. 2014-08-18 16:18:50 -04:00
Dwayne Slater
c4d860ceaf space space I wanna go to space 
QUICK: WHAT'S THE SITUATION? Oh, hey, hi pretty lady. My name's Rick. So, you out having a little adventure?
What's your favorite thing about space? Mine is space.
The likelihood of you dying violently within the next five minutes is eighty-seven point six one percent.
 2014-08-18 08:03:32 -04:00
WarwickAllison
4f01087652 Add Find (CTRL-F) to edit. 2014-08-18 09:22:38 +10:00
WarwickAllison
fa8b9600cc Add CTRL-DEL to delete line. 2014-08-18 09:21:46 +10:00
Florian Nücke
4336b14863 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	build.properties
 2014-08-17 00:56:54 +02:00
Florian Nücke
1d060db485 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-08-17 00:54:35 +02:00
Florian Nücke
0471f64fec Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-17 00:54:19 +02:00
Florian Nücke
c05ff8fb81 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-17 00:54:09 +02:00
Florian Nücke
5eb4a1e76e Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-08-17 00:53:50 +02:00
Florian Nücke
04114e68b8 Made screen T2 and raw circuit board recipes use oredict dyes, closes #493. 2014-08-17 00:53:28 +02:00
Florian "Sangar" Nücke
a46f71c72c Merge pull request #497 from gamax92/gpu_fix 
Make init.lua do exact component matching
 2014-08-17 00:39:56 +02:00
Florian Nücke
4508e4f45e Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 
Conflicts:
	build.properties
 2014-08-16 23:52:24 +02:00
Florian Nücke
c1299a6f1d Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-16 23:51:06 +02:00
Florian Nücke
52d2d10e3b Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-08-16 23:50:13 +02:00
Florian Nücke
f169cae801 Fixes a potential NPE in adapter if block driver returns null environment. 2014-08-16 23:49:55 +02:00
Florian Nücke
a621d69018 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/server/component/Keyboard.scala
 2014-08-16 23:42:09 +02:00
Florian Nücke
e0a7e75027 Fixed a memory leak on world unload, should close #498. 2014-08-16 23:38:37 +02:00
James Coon
cd6011ab20 Make init.lua do exact component matching 
Fixes init.lua randomly picking a different component that may happen to share "gpu" in the name.
 2014-08-16 12:56:52 -06:00
Florian Nücke
1fb79f16ab Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	build.properties
 2014-08-16 13:37:30 +02:00
Florian Nücke
62e7dff05b Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	build.properties
 2014-08-16 13:36:37 +02:00
Florian Nücke
0c43456e5f Also updating Adapter via onNeighborTileChange, closes #496 (hopefully). 2014-08-16 13:33:09 +02:00
Florian Nücke
bd258a9dd4 Adjustments for release. 2014-08-16 13:13:39 +02:00
Łukasz Magiera
d422d89cf4 Add OpenLoader Loot disk 2014-08-16 01:46:48 +02:00
Florian Nücke
de8aee3505 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	build.properties
 2014-08-15 17:20:20 +02:00
Florian Nücke
5992284458 Adjustments for release. 2014-08-15 17:18:06 +02:00