AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 18:30:27 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,948 Commits 29 Branches 143 Tags
Commit Graph

6948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
payonel
ee8c2902e2 a weak table does not need its keys removed 
also, this apparently increases the chance for obscure edge case bugs in lua gc
 2020-04-24 12:10:06 -07:00
bibo38
654b1507bd Simulating the insertion instead of inserting directly 
Previously the extraction was simulated and based on the simulated
extraction the extracted items were inserted. This was problematic, as
it relyed on the fact, that the simulation returns the same result as
the actual extraction. This caused problems, as extracting a component
only saves the changes to the component, when it is not simulated.
Furthermore it could cause item deduplication, if the actual extraction
returned something different.

To solve these issues, the insertion is also simulated on the simulated
extraction and the actual insertion is done on the actual extracted
items.
 2020-03-27 19:27:24 +01:00
hohserg
b9cc1663b2 Added waypoints addresses to navigation#findWaypoints 
Like
{
  redstone = <power>,
  position={<x>,<y>,<z>},
  label = "<label>",
  address = "<waypoint address uuid>"
}
 2020-01-30 19:22:52 -08:00
payonel
a19bb2b692 fix for setGameType, asie and BrisingrAerowing were right 
closes #2911
 2020-01-30 19:17:25 -08:00
payonel
a7eb1db087 Merge branch 'master-MC1.10' into master-MC1.12 
# Conflicts:
#	src/main/resources/assets/opencomputers/lang/de_DE.lang
 2020-01-28 00:19:46 -08:00
payonel
6475dae52f Merge branch 'master-MC1.7.10' into master-MC1.10 2020-01-28 00:19:21 -08:00
payonel
d179c0c20d whoops, forgot color 
#closes 3184 again
 2020-01-28 00:18:41 -08:00
JakobDev
352c1cb09a Update de_DE.lang 2020-01-28 00:18:41 -08:00
JakobDev
cca9c95945 Fix Comment 2020-01-28 00:18:41 -08:00
JakobDev
3190fed535 Update German Translation 2020-01-28 00:18:41 -08:00
payonel
67c375391b whoops, forgot color 
#closes 3184 again
 2020-01-28 00:07:59 -08:00
JakobDev
d03b217115 Update de_DE.lang 2020-01-26 23:07:26 -08:00
JakobDev
142ffdcf4c Fix Comment 2020-01-26 23:07:26 -08:00
JakobDev
4cc148778a Update German Translation 2020-01-26 23:07:26 -08:00
Mr. Jake
803402c4a9 Change modid from 'OpenComputers' to 'opencomputers' 
Camel case doesn't seem to work while all-lowercase does.
 2020-01-26 23:02:01 -08:00
payonel
2de3169e62 Merge branch 'master-MC1.10' into master-MC1.12 2020-01-26 22:24:36 -08:00
payonel
2647a59c02 Merge branch 'master-MC1.7.10' into master-MC1.10 2020-01-26 22:23:53 -08:00
payonel
e911f8af60 rotate side arg for redstone signal to relative side for rack and computer 
closes #3184
 2020-01-26 22:16:57 -08:00
payonel
5869bb3ebe Merge branch 'master-MC1.10' into master-MC1.12 2020-01-25 21:10:01 -08:00
payonel
2176854ff6 Merge branch 'master-MC1.7.10' into master-MC1.10 2020-01-25 21:09:34 -08:00
payonel
bec3b09fc0 fix wireless card behavior for tier 1 and tier 2 
closes #3195
 2020-01-25 21:08:04 -08:00
payonel
e9f92e0646 Merge branch 'master-MC1.10' into master-MC1.12 
# Conflicts:
#	gradle/wrapper/gradle-wrapper.properties
#	src/main/resources/assets/opencomputers/lang/ru_RU.lang
 2020-01-25 17:12:06 -08:00
payonel
3ece0d6f10 Merge branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
 2020-01-25 17:04:41 -08:00
payonel
5b1c60f5ed simplify io stream argument options 
also, fix mistake in text streams

closes: #3201
 2020-01-25 16:12:00 -08:00
payonel
8fe92ee191 fix text stream writer and clean up reader code along with this 2020-01-25 15:28:54 -08:00
Cruor
004ada9ae8 Fixed typo 2020-01-24 23:13:37 -08:00
Cruor
6e242128ee Added binary support to 'text.internal.reader' 2020-01-24 23:13:37 -08:00
Rodrigo Martins
8e69c06f52 Fix broken wireless card links in ingame manual 2020-01-24 21:58:41 -08:00
Vexatos
e452b1fb5e Switched to Gradle 5 version on Minecraft 1.7.10 
Using a fork of ForgeGradle for that which updates it to that version.
 2019-12-30 19:54:45 -08:00
Vexatos
36b9ba06d7
Downgraded Ubuntu version on travis to hopefully fix #3144. (#3198) 2019-12-26 00:10:03 +01:00
Smollet777
0a65a5a83b Update ru_RU.lang 2019-12-19 09:08:17 -08:00
Fingercomp
808d140b5f Use rawequal for comparison to avoid invoking __eq 2019-11-21 08:32:58 -08:00
Vexatos
310db04d33 Merge branch 'master-MC1.11' into master-MC1.12 2019-11-17 00:46:13 +01:00
Vexatos
5fa171a3ea Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	build.properties
 2019-11-17 00:44:44 +01:00
Vexatos
4ce2bf203e Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.10 2019-11-17 00:43:55 +01:00
Vexatos
343ce9687a Version and changelog bump. v1.7.5 2019-11-17 00:40:38 +01:00
payonel
54518a44bb Merge branch 'master-MC1.11' into master-MC1.12 2019-11-16 10:26:29 -08:00
payonel
ea27e2ecef Merge branch 'master-MC1.10' into master-MC1.11 2019-11-16 10:23:56 -08:00
payonel
db39561abf Merge branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/integration/appeng/NetworkControl.scala
 2019-11-16 10:22:39 -08:00
payonel
bfed64fa2d reducing some cost to calling ae getCraftables when no filter is given 
this delays calling ae.getItemStack until user code calls it for individual
items. this is vey helpful for servers with huge numbers of craftables
otherwise, all serializing calls happen on the main thread
closes #2964
 2019-11-16 10:17:47 -08:00
payonel
359f1c138d Merge branch 'master-MC1.11' into master-MC1.12 2019-11-15 23:07:52 -08:00
payonel
982dab9f70 Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	src/main/scala/li/cil/oc/common/EventHandler.scala
 2019-11-15 23:06:14 -08:00
payonel
751471905e Merge branch 'master-MC1.7.10' into master-MC1.10 2019-11-15 23:02:56 -08:00
payonel
dd63789b81 fix available archs based on configurations 
closes #2986
 2019-11-15 23:00:34 -08:00
payonel
73733dc7ad Merge branch 'master-MC1.11' into master-MC1.12 2019-11-14 22:47:42 -08:00
payonel
ba7e110c5f Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	src/main/scala/li/cil/oc/util/FluidUtils.scala
 2019-11-14 22:46:48 -08:00
payonel
d47915fece Merge branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/util/FluidUtils.scala
 2019-11-14 22:44:47 -08:00
payonel
063418a297 require minimum of 1000 mb to place fluid source block 
closes #3116
 2019-11-14 22:41:29 -08:00
payonel
4334aa0053 Merge branch 'master-MC1.11' into master-MC1.12 2019-11-14 00:58:55 -08:00
payonel
f5f8f8e0b2 Merge branch 'master-MC1.10' into master-MC1.11 2019-11-14 00:54:37 -08:00